diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 19edf31..ad1dac7 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -32,8 +32,6 @@ namespace AppData { private OrderListDataTable tableOrderList; - private BatchReqListDataTable tableBatchReqList; - private ItemListDataTable tableItemList; private MaterialsDataTable tableMaterials; @@ -100,8 +98,6 @@ namespace AppData { private SheetsPreviewDataTable tableSheetsPreview; - private global::System.Data.DataRelation relationFK_BatchReqList_OrderList; - private global::System.Data.DataRelation relationFK_ItemList_Materials1; private global::System.Data.DataRelation relationFK_OffOrd2Item_OfflineOrderList; @@ -164,9 +160,6 @@ namespace AppData { if ((ds.Tables["OrderList"] != null)) { base.Tables.Add(new OrderListDataTable(ds.Tables["OrderList"])); } - if ((ds.Tables["BatchReqList"] != null)) { - base.Tables.Add(new BatchReqListDataTable(ds.Tables["BatchReqList"])); - } if ((ds.Tables["ItemList"] != null)) { base.Tables.Add(new ItemListDataTable(ds.Tables["ItemList"])); } @@ -324,16 +317,6 @@ 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 BatchReqListDataTable BatchReqList { - get { - return this.tableBatchReqList; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -743,9 +726,6 @@ namespace AppData { if ((ds.Tables["OrderList"] != null)) { base.Tables.Add(new OrderListDataTable(ds.Tables["OrderList"])); } - if ((ds.Tables["BatchReqList"] != null)) { - base.Tables.Add(new BatchReqListDataTable(ds.Tables["BatchReqList"])); - } if ((ds.Tables["ItemList"] != null)) { base.Tables.Add(new ItemListDataTable(ds.Tables["ItemList"])); } @@ -902,12 +882,6 @@ namespace AppData { this.tableOrderList.InitVars(); } } - this.tableBatchReqList = ((BatchReqListDataTable)(base.Tables["BatchReqList"])); - if ((initTable == true)) { - if ((this.tableBatchReqList != null)) { - this.tableBatchReqList.InitVars(); - } - } this.tableItemList = ((ItemListDataTable)(base.Tables["ItemList"])); if ((initTable == true)) { if ((this.tableItemList != null)) { @@ -1106,7 +1080,6 @@ namespace AppData { this.tableSheetsPreview.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"]; this.relationFK_ItemList_KitList = this.Relations["FK_ItemList_KitList"]; @@ -1136,8 +1109,6 @@ namespace AppData { base.Tables.Add(this.tableSheetList); this.tableOrderList = new OrderListDataTable(); base.Tables.Add(this.tableOrderList); - this.tableBatchReqList = new BatchReqListDataTable(); - base.Tables.Add(this.tableBatchReqList); this.tableItemList = new ItemListDataTable(); base.Tables.Add(this.tableItemList); this.tableMaterials = new MaterialsDataTable(); @@ -1204,10 +1175,6 @@ namespace AppData { base.Tables.Add(this.tableFileValidation); this.tableSheetsPreview = new SheetsPreviewDataTable(); base.Tables.Add(this.tableSheetsPreview); - 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); - this.Relations.Add(this.relationFK_BatchReqList_OrderList); this.relationFK_ItemList_Materials1 = new global::System.Data.DataRelation("FK_ItemList_Materials1", new global::System.Data.DataColumn[] { this.tableMaterials.MatIDColumn}, new global::System.Data.DataColumn[] { this.tableItemList.MatIDColumn}, false); @@ -1278,12 +1245,6 @@ namespace AppData { return false; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private bool ShouldSerializeBatchReqList() { - return false; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private bool ShouldSerializeItemList() { @@ -1549,9 +1510,6 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void OrderListRowChangeEventHandler(object sender, OrderListRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public delegate void BatchReqListRowChangeEventHandler(object sender, BatchReqListRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void ItemListRowChangeEventHandler(object sender, ItemListRowChangeEvent e); @@ -1698,6 +1656,8 @@ namespace AppData { private global::System.Data.DataColumn columnErrors; + private global::System.Data.DataColumn columnBatchType; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public BatchListDataTable() { @@ -1891,6 +1851,14 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn BatchTypeColumn { + get { + return this.columnBatchType; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1947,7 +1915,8 @@ namespace AppData { int NumItems, int NumStacks, int NumSheets, - string Errors) { + string Errors, + int BatchType) { BatchListRow rowBatchListRow = ((BatchListRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1969,7 +1938,8 @@ namespace AppData { NumItems, NumStacks, NumSheets, - Errors}; + Errors, + BatchType}; rowBatchListRow.ItemArray = columnValuesArray; this.Rows.Add(rowBatchListRow); return rowBatchListRow; @@ -2019,6 +1989,7 @@ namespace AppData { this.columnNumStacks = base.Columns["NumStacks"]; this.columnNumSheets = base.Columns["NumSheets"]; this.columnErrors = base.Columns["Errors"]; + this.columnBatchType = base.Columns["BatchType"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2064,6 +2035,8 @@ namespace AppData { base.Columns.Add(this.columnNumSheets); this.columnErrors = new global::System.Data.DataColumn("Errors", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnErrors); + this.columnBatchType = new global::System.Data.DataColumn("BatchType", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchType); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnBatchID}, true)); this.columnBatchID.AutoIncrement = true; @@ -2092,6 +2065,7 @@ namespace AppData { this.columnNumSheets.ReadOnly = true; this.columnErrors.ReadOnly = true; this.columnErrors.MaxLength = 2147483647; + this.columnBatchType.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3329,6 +3303,12 @@ namespace AppData { private global::System.Data.DataColumn columnKittingDate; + private global::System.Data.DataColumn columnEstNumPart; + + private global::System.Data.DataColumn columnEstNumCart; + + private global::System.Data.DataColumn columnEstProcTime; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public OrderListDataTable() { @@ -3466,6 +3446,30 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn EstNumPartColumn { + get { + return this.columnEstNumPart; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn EstNumCartColumn { + get { + return this.columnEstNumCart; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn EstProcTimeColumn { + get { + return this.columnEstProcTime; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3503,7 +3507,23 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OrderListRow AddOrderListRow(int OrdID, string OrdType, string DestPlant, string FamilyCode, string OrdDtmx, string OrderExtCode, string OrderDesc, string OrderNote, int KitQty, System.DateTime ImportDate, string ImportUser, string OrdCodOrig, System.DateTime KittingDate) { + public OrderListRow AddOrderListRow( + int OrdID, + string OrdType, + string DestPlant, + string FamilyCode, + string OrdDtmx, + string OrderExtCode, + string OrderDesc, + string OrderNote, + int KitQty, + System.DateTime ImportDate, + string ImportUser, + string OrdCodOrig, + System.DateTime KittingDate, + int EstNumPart, + int EstNumCart, + double EstProcTime) { OrderListRow rowOrderListRow = ((OrderListRow)(this.NewRow())); object[] columnValuesArray = new object[] { OrdID, @@ -3518,7 +3538,10 @@ namespace AppData { ImportDate, ImportUser, OrdCodOrig, - KittingDate}; + KittingDate, + EstNumPart, + EstNumCart, + EstProcTime}; rowOrderListRow.ItemArray = columnValuesArray; this.Rows.Add(rowOrderListRow); return rowOrderListRow; @@ -3561,6 +3584,9 @@ namespace AppData { this.columnImportUser = base.Columns["ImportUser"]; this.columnOrdCodOrig = base.Columns["OrdCodOrig"]; this.columnKittingDate = base.Columns["KittingDate"]; + this.columnEstNumPart = base.Columns["EstNumPart"]; + this.columnEstNumCart = base.Columns["EstNumCart"]; + this.columnEstProcTime = base.Columns["EstProcTime"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3592,6 +3618,12 @@ namespace AppData { base.Columns.Add(this.columnOrdCodOrig); this.columnKittingDate = new global::System.Data.DataColumn("KittingDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnKittingDate); + this.columnEstNumPart = new global::System.Data.DataColumn("EstNumPart", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnEstNumPart); + this.columnEstNumCart = new global::System.Data.DataColumn("EstNumCart", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnEstNumCart); + this.columnEstProcTime = new global::System.Data.DataColumn("EstProcTime", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnEstProcTime); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnOrdID}, true)); this.columnOrdID.AllowDBNull = false; @@ -3615,6 +3647,9 @@ namespace AppData { this.columnImportUser.AllowDBNull = false; this.columnImportUser.MaxLength = 50; this.columnOrdCodOrig.MaxLength = 50; + this.columnEstNumPart.AllowDBNull = false; + this.columnEstNumCart.AllowDBNull = false; + this.columnEstProcTime.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3741,283 +3776,6 @@ namespace AppData { } } - /// - ///Represents the strongly named DataTable class. - /// - [global::System.Serializable()] - [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class BatchReqListDataTable : global::System.Data.TypedTableBase { - - private global::System.Data.DataColumn columnBatchID; - - private global::System.Data.DataColumn columnOrdID; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public BatchReqListDataTable() { - this.TableName = "BatchReqList"; - this.BeginInit(); - this.InitClass(); - this.EndInit(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal BatchReqListDataTable(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 BatchReqListDataTable(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 BatchIDColumn { - get { - return this.columnBatchID; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn OrdIDColumn { - get { - return this.columnOrdID; - } - } - - [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 BatchReqListRow this[int index] { - get { - return ((BatchReqListRow)(this.Rows[index])); - } - } - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event BatchReqListRowChangeEventHandler BatchReqListRowChanging; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event BatchReqListRowChangeEventHandler BatchReqListRowChanged; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event BatchReqListRowChangeEventHandler BatchReqListRowDeleting; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event BatchReqListRowChangeEventHandler BatchReqListRowDeleted; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void AddBatchReqListRow(BatchReqListRow row) { - this.Rows.Add(row); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public BatchReqListRow AddBatchReqListRow(int BatchID, OrderListRow parentOrderListRowByFK_BatchReqList_OrderList) { - BatchReqListRow rowBatchReqListRow = ((BatchReqListRow)(this.NewRow())); - object[] columnValuesArray = new object[] { - BatchID, - null}; - if ((parentOrderListRowByFK_BatchReqList_OrderList != null)) { - columnValuesArray[1] = parentOrderListRowByFK_BatchReqList_OrderList[0]; - } - rowBatchReqListRow.ItemArray = columnValuesArray; - this.Rows.Add(rowBatchReqListRow); - return rowBatchReqListRow; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public BatchReqListRow FindByBatchIDOrdID(int BatchID, int OrdID) { - return ((BatchReqListRow)(this.Rows.Find(new object[] { - BatchID, - OrdID}))); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public override global::System.Data.DataTable Clone() { - BatchReqListDataTable cln = ((BatchReqListDataTable)(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 BatchReqListDataTable(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal void InitVars() { - this.columnBatchID = base.Columns["BatchID"]; - this.columnOrdID = base.Columns["OrdID"]; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private void InitClass() { - this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnBatchID); - this.columnOrdID = new global::System.Data.DataColumn("OrdID", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnOrdID); - this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { - this.columnBatchID, - this.columnOrdID}, true)); - this.columnBatchID.AllowDBNull = false; - this.columnOrdID.AllowDBNull = false; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public BatchReqListRow NewBatchReqListRow() { - return ((BatchReqListRow)(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 BatchReqListRow(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(BatchReqListRow); - } - - [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.BatchReqListRowChanged != null)) { - this.BatchReqListRowChanged(this, new BatchReqListRowChangeEvent(((BatchReqListRow)(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.BatchReqListRowChanging != null)) { - this.BatchReqListRowChanging(this, new BatchReqListRowChangeEvent(((BatchReqListRow)(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.BatchReqListRowDeleted != null)) { - this.BatchReqListRowDeleted(this, new BatchReqListRowChangeEvent(((BatchReqListRow)(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.BatchReqListRowDeleting != null)) { - this.BatchReqListRowDeleting(this, new BatchReqListRowChangeEvent(((BatchReqListRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void RemoveBatchReqListRow(BatchReqListRow 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 = "BatchReqListDataTable"; - 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 the strongly named DataTable class. /// @@ -17388,6 +17146,17 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int BatchType { + get { + return ((int)(this[this.tableBatchList.BatchTypeColumn])); + } + set { + this[this.tableBatchList.BatchTypeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsNestingReqNull() { @@ -18452,6 +18221,39 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int EstNumPart { + get { + return ((int)(this[this.tableOrderList.EstNumPartColumn])); + } + set { + this[this.tableOrderList.EstNumPartColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int EstNumCart { + get { + return ((int)(this[this.tableOrderList.EstNumCartColumn])); + } + set { + this[this.tableOrderList.EstNumCartColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double EstProcTime { + get { + return ((double)(this[this.tableOrderList.EstProcTimeColumn])); + } + set { + this[this.tableOrderList.EstProcTimeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsOrdDtmxNull() { @@ -18488,17 +18290,6 @@ namespace AppData { this[this.tableOrderList.KittingDateColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public BatchReqListRow[] GetBatchReqListRows() { - if ((this.Table.ChildRelations["FK_BatchReqList_OrderList"] == null)) { - return new BatchReqListRow[0]; - } - else { - return ((BatchReqListRow[])(base.GetChildRows(this.Table.ChildRelations["FK_BatchReqList_OrderList"]))); - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public KitListRow[] GetKitListRows() { @@ -18522,54 +18313,6 @@ namespace AppData { } } - /// - ///Represents strongly named DataRow class. - /// - public partial class BatchReqListRow : global::System.Data.DataRow { - - private BatchReqListDataTable tableBatchReqList; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal BatchReqListRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tableBatchReqList = ((BatchReqListDataTable)(this.Table)); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int BatchID { - get { - return ((int)(this[this.tableBatchReqList.BatchIDColumn])); - } - set { - this[this.tableBatchReqList.BatchIDColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int OrdID { - get { - return ((int)(this[this.tableBatchReqList.OrdIDColumn])); - } - set { - this[this.tableBatchReqList.OrdIDColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OrderListRow OrderListRow { - get { - return ((OrderListRow)(this.GetParentRow(this.Table.ParentRelations["FK_BatchReqList_OrderList"]))); - } - set { - this.SetParentRow(value, this.Table.ParentRelations["FK_BatchReqList_OrderList"]); - } - } - } - /// ///Represents strongly named DataRow class. /// @@ -24884,40 +24627,6 @@ namespace AppData { } } - /// - ///Row event argument class - /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public class BatchReqListRowChangeEvent : global::System.EventArgs { - - private BatchReqListRow 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 BatchReqListRowChangeEvent(BatchReqListRow 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 BatchReqListRow 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; - } - } - } - /// ///Row event argument class /// @@ -26185,6 +25894,7 @@ namespace AppData.DS_AppTableAdapters { tableMapping.ColumnMappings.Add("NumStacks", "NumStacks"); tableMapping.ColumnMappings.Add("NumSheets", "NumSheets"); tableMapping.ColumnMappings.Add("Errors", "Errors"); + tableMapping.ColumnMappings.Add("BatchType", "BatchType"); this._adapter.TableMappings.Add(tableMapping); } @@ -28099,10 +27809,13 @@ namespace AppData.DS_AppTableAdapters { tableMapping.ColumnMappings.Add("ImportUser", "ImportUser"); tableMapping.ColumnMappings.Add("OrdCodOrig", "OrdCodOrig"); tableMapping.ColumnMappings.Add("KittingDate", "KittingDate"); + tableMapping.ColumnMappings.Add("EstNumPart", "EstNumPart"); + tableMapping.ColumnMappings.Add("EstNumCart", "EstNumCart"); + tableMapping.ColumnMappings.Add("EstProcTime", "EstProcTime"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -28120,10 +27833,13 @@ namespace AppData.DS_AppTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_KittingDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate], [EstNumPart], [EstNumCart], [EstProcTime]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate, @EstNumPart, @EstNumCart, @EstProcTime); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime FROM OrderList WHERE (OrdID = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DestPlant", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DestPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -28136,10 +27852,13 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ImportUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [OrderList] SET [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig, [KittingDate] = @KittingDate WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate))); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = @OrdID)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [OrderList] SET [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig, [KittingDate] = @KittingDate, [EstNumPart] = @EstNumPart, [EstNumCart] = @EstNumCart, [EstProcTime] = @EstProcTime WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime)); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime FROM OrderList WHERE (OrdID = @OrdID)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DestPlant", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DestPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -28152,6 +27871,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ImportUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ImportUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdType", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdType", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DestPlant", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DestPlant", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -28168,6 +27890,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdCodOrig", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdCodOrig", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_KittingDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_KittingDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "KittingDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstNumPart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumPart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstNumCart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstNumCart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EstProcTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EstProcTime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -28181,7 +27906,7 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, [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[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM OrderList"; @@ -28198,6 +27923,15 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "dbo.stp_OL_updateExtEst"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumCart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstNumPart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EstProcTime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -28291,7 +28025,23 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_OrdID, string Original_OrdType, string Original_DestPlant, string Original_FamilyCode, string Original_OrdDtmx, string Original_OrderExtCode, string Original_OrderDesc, string Original_OrderNote, int Original_KitQty, System.DateTime Original_ImportDate, string Original_ImportUser, string Original_OrdCodOrig, global::System.Nullable Original_KittingDate) { + public virtual int Delete( + int Original_OrdID, + string Original_OrdType, + string Original_DestPlant, + string Original_FamilyCode, + string Original_OrdDtmx, + string Original_OrderExtCode, + string Original_OrderDesc, + string Original_OrderNote, + int Original_KitQty, + System.DateTime Original_ImportDate, + string Original_ImportUser, + string Original_OrdCodOrig, + global::System.Nullable Original_KittingDate, + int Original_EstNumPart, + int Original_EstNumCart, + double Original_EstProcTime) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_OrdID)); if ((Original_OrdType == null)) { throw new global::System.ArgumentNullException("Original_OrdType"); @@ -28361,6 +28111,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[15].Value = global::System.DBNull.Value; } + this.Adapter.DeleteCommand.Parameters[16].Value = ((int)(Original_EstNumPart)); + this.Adapter.DeleteCommand.Parameters[17].Value = ((int)(Original_EstNumCart)); + this.Adapter.DeleteCommand.Parameters[18].Value = ((double)(Original_EstProcTime)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -28381,7 +28134,7 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string OrdType, string DestPlant, string FamilyCode, string OrderExtCode, string OrderDesc, string OrderNote, int KitQty, System.DateTime ImportDate, string ImportUser, string OrdCodOrig, global::System.Nullable KittingDate) { + public virtual int Insert(string OrdType, string DestPlant, string FamilyCode, string OrderExtCode, string OrderDesc, string OrderNote, int KitQty, System.DateTime ImportDate, string ImportUser, string OrdCodOrig, global::System.Nullable KittingDate, int EstNumPart, int EstNumCart, double EstProcTime) { if ((OrdType == null)) { throw new global::System.ArgumentNullException("OrdType"); } @@ -28438,6 +28191,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, else { this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; } + this.Adapter.InsertCommand.Parameters[11].Value = ((int)(EstNumPart)); + this.Adapter.InsertCommand.Parameters[12].Value = ((int)(EstNumCart)); + this.Adapter.InsertCommand.Parameters[13].Value = ((double)(EstProcTime)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -28470,6 +28226,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, string ImportUser, string OrdCodOrig, global::System.Nullable KittingDate, + int EstNumPart, + int EstNumCart, + double EstProcTime, int Original_OrdID, string Original_OrdType, string Original_DestPlant, @@ -28483,6 +28242,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, string Original_ImportUser, string Original_OrdCodOrig, global::System.Nullable Original_KittingDate, + int Original_EstNumPart, + int Original_EstNumCart, + double Original_EstProcTime, int OrdID) { if ((OrdType == null)) { throw new global::System.ArgumentNullException("OrdType"); @@ -28540,76 +28302,82 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, else { this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_OrdID)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(EstNumPart)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(EstNumCart)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((double)(EstProcTime)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_OrdID)); if ((Original_OrdType == null)) { throw new global::System.ArgumentNullException("Original_OrdType"); } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_OrdType)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_OrdType)); } if ((Original_DestPlant == null)) { throw new global::System.ArgumentNullException("Original_DestPlant"); } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_DestPlant)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_DestPlant)); } if ((Original_FamilyCode == null)) { throw new global::System.ArgumentNullException("Original_FamilyCode"); } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_FamilyCode)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_FamilyCode)); } if ((Original_OrdDtmx == null)) { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_OrdDtmx)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_OrdDtmx)); } if ((Original_OrderExtCode == null)) { throw new global::System.ArgumentNullException("Original_OrderExtCode"); } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_OrderExtCode)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_OrderExtCode)); } if ((Original_OrderDesc == null)) { throw new global::System.ArgumentNullException("Original_OrderDesc"); } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_OrderDesc)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_OrderDesc)); } if ((Original_OrderNote == null)) { throw new global::System.ArgumentNullException("Original_OrderNote"); } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_OrderNote)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_OrderNote)); } - this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_KitQty)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((System.DateTime)(Original_ImportDate)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_KitQty)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_ImportDate)); if ((Original_ImportUser == null)) { throw new global::System.ArgumentNullException("Original_ImportUser"); } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_ImportUser)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_ImportUser)); } if ((Original_OrdCodOrig == null)) { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_OrdCodOrig)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_OrdCodOrig)); } if ((Original_KittingDate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((System.DateTime)(Original_KittingDate.Value)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((System.DateTime)(Original_KittingDate.Value)); } else { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(OrdID)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_EstNumPart)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_EstNumCart)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((double)(Original_EstProcTime)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(OrdID)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -28642,6 +28410,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, string ImportUser, string OrdCodOrig, global::System.Nullable KittingDate, + int EstNumPart, + int EstNumCart, + double EstProcTime, int Original_OrdID, string Original_OrdType, string Original_DestPlant, @@ -28654,310 +28425,58 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, System.DateTime Original_ImportDate, string Original_ImportUser, string Original_OrdCodOrig, - global::System.Nullable Original_KittingDate) { - return this.Update(OrdType, DestPlant, FamilyCode, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, Original_OrdID, Original_OrdType, Original_DestPlant, Original_FamilyCode, Original_OrdDtmx, Original_OrderExtCode, Original_OrderDesc, Original_OrderNote, Original_KitQty, Original_ImportDate, Original_ImportUser, Original_OrdCodOrig, Original_KittingDate, Original_OrdID); - } - } - - /// - ///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 BatchReqListTableAdapter : 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 BatchReqListTableAdapter() { - 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 = "BatchReqList"; - tableMapping.ColumnMappings.Add("BatchID", "BatchID"); - tableMapping.ColumnMappings.Add("OrdID", "OrdID"); - this._adapter.TableMappings.Add(tableMapping); - this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[BatchReqList] WHERE (([BatchID] = @Original_BatchID) AND ([Ord" + - "ID] = @Original_OrdID))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[BatchReqList] ([BatchID], [OrdID]) VALUES (@BatchID, @OrdID);\r" + - "\nSELECT BatchID, OrdID FROM BatchReqList WHERE (BatchID = @BatchID) AND (OrdID =" + - " @OrdID)"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[BatchReqList] SET [BatchID] = @BatchID, [OrdID] = @OrdID WHERE (([B" + - "atchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID));\r\nSELECT BatchID, " + - "OrdID FROM BatchReqList WHERE (BatchID = @BatchID) AND (OrdID = @OrdID)"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - } - - [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 = "SELECT BatchID, OrdID FROM dbo.BatchReqList"; - this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + global::System.Nullable Original_KittingDate, + int Original_EstNumPart, + int Original_EstNumCart, + double Original_EstProcTime) { + return this.Update(OrdType, DestPlant, FamilyCode, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime, Original_OrdID, Original_OrdType, Original_DestPlant, Original_FamilyCode, Original_OrdDtmx, Original_OrderExtCode, Original_OrderDesc, Original_OrderNote, Original_KitQty, Original_ImportDate, Original_ImportUser, Original_OrdCodOrig, Original_KittingDate, Original_EstNumPart, Original_EstNumCart, Original_EstProcTime, Original_OrdID); } [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.BatchReqListDataTable dataTable) { - this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((this.ClearBeforeFill == true)) { - dataTable.Clear(); + public virtual int updateExtEst(global::System.Nullable Original_OrdID, global::System.Nullable EstNumCart, global::System.Nullable EstNumPart, global::System.Nullable EstProcTime) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + if ((Original_OrdID.HasValue == true)) { + command.Parameters[1].Value = ((int)(Original_OrdID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((EstNumCart.HasValue == true)) { + command.Parameters[2].Value = ((int)(EstNumCart.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((EstNumPart.HasValue == true)) { + command.Parameters[3].Value = ((int)(EstNumPart.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((EstProcTime.HasValue == true)) { + command.Parameters[4].Value = ((double)(EstProcTime.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } } - 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.BatchReqListDataTable GetData() { - this.Adapter.SelectCommand = this.CommandCollection[0]; - DS_App.BatchReqListDataTable dataTable = new DS_App.BatchReqListDataTable(); - 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")] - public virtual int Update(DS_App.BatchReqListDataTable dataTable) { - return this.Adapter.Update(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")] - public virtual int Update(DS_App dataSet) { - return this.Adapter.Update(dataSet, "BatchReqList"); - } - - [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")] - public virtual int Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [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")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_BatchID, int Original_OrdID) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_BatchID)); - this.Adapter.DeleteCommand.Parameters[1].Value = ((int)(Original_OrdID)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [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.Insert, true)] - public virtual int Insert(int BatchID, int OrdID) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(BatchID)); - this.Adapter.InsertCommand.Parameters[1].Value = ((int)(OrdID)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; - if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.InsertCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - - [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.Update, true)] - public virtual int Update(int BatchID, int OrdID, int Original_BatchID, int Original_OrdID) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(BatchID)); - this.Adapter.UpdateCommand.Parameters[1].Value = ((int)(OrdID)); - this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(Original_BatchID)); - this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Original_OrdID)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; - if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); - } - } - } - - [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.Update, true)] - public virtual int Update(int Original_BatchID, int Original_OrdID) { - return this.Update(Original_BatchID, Original_OrdID, Original_BatchID, Original_OrdID); - } } /// @@ -39595,8 +39114,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE private OrderListTableAdapter _orderListTableAdapter; - private BatchReqListTableAdapter _batchReqListTableAdapter; - private ItemListTableAdapter _itemListTableAdapter; private MaterialsTableAdapter _materialsTableAdapter; @@ -39652,20 +39169,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + - "a", "System.Drawing.Design.UITypeEditor")] - public BatchReqListTableAdapter BatchReqListTableAdapter { - get { - return this._batchReqListTableAdapter; - } - set { - this._batchReqListTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + @@ -39871,10 +39374,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE && (this._orderListTableAdapter.Connection != null))) { return this._orderListTableAdapter.Connection; } - if (((this._batchReqListTableAdapter != null) - && (this._batchReqListTableAdapter.Connection != null))) { - return this._batchReqListTableAdapter.Connection; - } if (((this._itemListTableAdapter != null) && (this._itemListTableAdapter.Connection != null))) { return this._itemListTableAdapter.Connection; @@ -39943,9 +39442,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE if ((this._orderListTableAdapter != null)) { count = (count + 1); } - if ((this._batchReqListTableAdapter != null)) { - count = (count + 1); - } if ((this._itemListTableAdapter != null)) { count = (count + 1); } @@ -40005,15 +39501,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(updatedRows); } } - if ((this._materialsTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Materials.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._materialsTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._kitListTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -40023,6 +39510,15 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(updatedRows); } } + if ((this._materialsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Materials.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._materialsTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._itemListTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -40041,15 +39537,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(updatedRows); } } - if ((this._errorsLogTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._errorsLogTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._itemValidationTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.ItemValidation.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -40068,6 +39555,15 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(updatedRows); } } + if ((this._errorsLogTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._errorsLogTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._countersTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -40113,15 +39609,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(updatedRows); } } - if ((this._batchReqListTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.BatchReqList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._batchReqListTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._remnantsTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -40149,14 +39636,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allAddedRows.AddRange(addedRows); } } - if ((this._materialsTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Materials.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._materialsTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._kitListTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -40165,6 +39644,14 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allAddedRows.AddRange(addedRows); } } + if ((this._materialsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Materials.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._materialsTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._itemListTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -40181,14 +39668,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allAddedRows.AddRange(addedRows); } } - if ((this._errorsLogTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._errorsLogTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._itemValidationTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.ItemValidation.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -40205,6 +39684,14 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allAddedRows.AddRange(addedRows); } } + if ((this._errorsLogTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._errorsLogTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._countersTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -40245,14 +39732,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allAddedRows.AddRange(addedRows); } } - if ((this._batchReqListTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.BatchReqList.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._batchReqListTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._remnantsTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -40279,14 +39758,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(deletedRows); } } - if ((this._batchReqListTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.BatchReqList.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._batchReqListTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -40327,6 +39798,14 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(deletedRows); } } + if ((this._errorsLogTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._errorsLogTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._fileValidationTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.FileValidation.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -40343,14 +39822,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(deletedRows); } } - if ((this._errorsLogTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._errorsLogTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._finalKitTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.FinalKit.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -40367,14 +39838,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(deletedRows); } } - if ((this._kitListTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._kitListTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._materialsTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Materials.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -40383,6 +39846,14 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE allChangedRows.AddRange(deletedRows); } } + if ((this._kitListTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._kitListTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._orderListTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.OrderList.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -40435,11 +39906,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } - if (((this._batchReqListTableAdapter != null) - && (this.MatchTableAdapterConnection(this._batchReqListTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + - "tring."); - } if (((this._itemListTableAdapter != null) && (this.MatchTableAdapterConnection(this._itemListTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + @@ -40546,15 +40012,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE adaptersWithAcceptChangesDuringUpdate.Add(this._orderListTableAdapter.Adapter); } } - if ((this._batchReqListTableAdapter != null)) { - revertConnections.Add(this._batchReqListTableAdapter, this._batchReqListTableAdapter.Connection); - this._batchReqListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._batchReqListTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._batchReqListTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._batchReqListTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._batchReqListTableAdapter.Adapter); - } - } if ((this._itemListTableAdapter != null)) { revertConnections.Add(this._itemListTableAdapter, this._itemListTableAdapter.Connection); this._itemListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -40734,10 +40191,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE this._orderListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._orderListTableAdapter])); this._orderListTableAdapter.Transaction = null; } - if ((this._batchReqListTableAdapter != null)) { - this._batchReqListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._batchReqListTableAdapter])); - this._batchReqListTableAdapter.Transaction = null; - } if ((this._itemListTableAdapter != null)) { this._itemListTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._itemListTableAdapter])); this._itemListTableAdapter.Transaction = null; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index dd7ca16..5c5ee13 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -624,7 +624,7 @@ FROM v_SheetList - DELETE FROM [OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate))) + DELETE FROM [OrderList] WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime)) @@ -642,13 +642,16 @@ FROM v_SheetList + + + - INSERT INTO [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = SCOPE_IDENTITY()) + INSERT INTO [OrderList] ([OrdType], [DestPlant], [FamilyCode], [OrderExtCode], [OrderDesc], [OrderNote], [KitQty], [ImportDate], [ImportUser], [OrdCodOrig], [KittingDate], [EstNumPart], [EstNumCart], [EstProcTime]) VALUES (@OrdType, @DestPlant, @FamilyCode, @OrderExtCode, @OrderDesc, @OrderNote, @KitQty, @ImportDate, @ImportUser, @OrdCodOrig, @KittingDate, @EstNumPart, @EstNumCart, @EstProcTime); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime FROM OrderList WHERE (OrdID = SCOPE_IDENTITY()) @@ -661,6 +664,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, + + + @@ -672,8 +678,8 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, - UPDATE [OrderList] SET [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig, [KittingDate] = @KittingDate WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate))); -SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate FROM OrderList WHERE (OrdID = @OrdID) + UPDATE [OrderList] SET [OrdType] = @OrdType, [DestPlant] = @DestPlant, [FamilyCode] = @FamilyCode, [OrderExtCode] = @OrderExtCode, [OrderDesc] = @OrderDesc, [OrderNote] = @OrderNote, [KitQty] = @KitQty, [ImportDate] = @ImportDate, [ImportUser] = @ImportUser, [OrdCodOrig] = @OrdCodOrig, [KittingDate] = @KittingDate, [EstNumPart] = @EstNumPart, [EstNumCart] = @EstNumCart, [EstProcTime] = @EstProcTime WHERE (([OrdID] = @Original_OrdID) AND ([OrdType] = @Original_OrdType) AND ([DestPlant] = @Original_DestPlant) AND ([FamilyCode] = @Original_FamilyCode) AND ((@IsNull_OrdDtmx = 1 AND [OrdDtmx] IS NULL) OR ([OrdDtmx] = @Original_OrdDtmx)) AND ([OrderExtCode] = @Original_OrderExtCode) AND ([OrderDesc] = @Original_OrderDesc) AND ([OrderNote] = @Original_OrderNote) AND ([KitQty] = @Original_KitQty) AND ([ImportDate] = @Original_ImportDate) AND ([ImportUser] = @Original_ImportUser) AND ((@IsNull_OrdCodOrig = 1 AND [OrdCodOrig] IS NULL) OR ([OrdCodOrig] = @Original_OrdCodOrig)) AND ((@IsNull_KittingDate = 1 AND [KittingDate] IS NULL) OR ([KittingDate] = @Original_KittingDate)) AND ([EstNumPart] = @Original_EstNumPart) AND ([EstNumCart] = @Original_EstNumCart) AND ([EstProcTime] = @Original_EstProcTime)); +SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, OrderNote, KitQty, ImportDate, ImportUser, OrdCodOrig, KittingDate, EstNumPart, EstNumCart, EstProcTime FROM OrderList WHERE (OrdID = @OrdID) @@ -686,6 +692,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, + + + @@ -702,6 +711,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, + + + @@ -722,6 +734,9 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, + + + @@ -746,55 +761,21 @@ SELECT OrdID, OrdType, DestPlant, FamilyCode, OrdDtmx, OrderExtCode, OrderDesc, - - - - - - - - DELETE FROM [dbo].[BatchReqList] WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID)) - - - - - - - - - INSERT INTO [dbo].[BatchReqList] ([BatchID], [OrdID]) VALUES (@BatchID, @OrdID); -SELECT BatchID, OrdID FROM BatchReqList WHERE (BatchID = @BatchID) AND (OrdID = @OrdID) - - - - - - + - - SELECT BatchID, OrdID FROM dbo.BatchReqList - + + dbo.stp_OL_updateExtEst + + + + + + + - - - UPDATE [dbo].[BatchReqList] SET [BatchID] = @BatchID, [OrdID] = @OrdID WHERE (([BatchID] = @Original_BatchID) AND ([OrdID] = @Original_OrdID)); -SELECT BatchID, OrdID FROM BatchReqList WHERE (BatchID = @BatchID) AND (OrdID = @OrdID) - - - - - - - - - - - - - - + @@ -3340,7 +3321,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3390,7 +3371,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3415,7 +3396,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3470,7 +3451,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3540,18 +3521,13 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE + + + - - - - - - - - - + @@ -3620,7 +3596,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3653,7 +3629,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3725,7 +3701,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3744,7 +3720,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3775,7 +3751,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3783,7 +3759,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3800,7 +3776,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3809,7 +3785,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3840,7 +3816,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3848,7 +3824,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3864,7 +3840,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3872,7 +3848,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3900,7 +3876,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3936,7 +3912,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3952,7 +3928,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3962,7 +3938,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3979,7 +3955,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3992,7 +3968,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4041,7 +4017,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4070,7 +4046,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4112,7 +4088,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4223,7 +4199,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4286,7 +4262,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4331,7 +4307,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4357,7 +4333,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4450,7 +4426,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4513,7 +4489,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4572,7 +4548,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4621,7 +4597,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4660,7 +4636,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4713,7 +4689,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4730,7 +4706,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4761,11 +4737,6 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - - - - - @@ -4892,18 +4863,17 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 65e8c7c..81fa551 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,60 +4,47 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - 352 - 144 - - - 321 - 144 - - - @@ -106,7 +93,7 @@ - + 707 @@ -118,19 +105,23 @@ - + - 550 - 97 + 582 + 295 - 612 - 97 + 677 + 295 + + + 677 + 278 - + 1129 @@ -142,7 +133,7 @@ - + 1380 @@ -154,7 +145,7 @@ - + 1161 @@ -166,7 +157,7 @@ - + 131 @@ -178,15 +169,15 @@ - + - 352 - 293 + 360 + 266 247 - 293 + 266 diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index bab6718..b4dc571 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -390,6 +390,7 @@ namespace NKC_WF.Controllers // aggiorno la risposta dei tempi di esecuzione degli ordini x permettere aggiustamenti // FARE FIXME TODO !!! + // aggiornamento OrderList con // aggiorno cadPath x items che non abbiano valorizzato... string dxfFolder = memLayer.ML.CRS("drawingFolder"); diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs index af04248..8b98a11 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs @@ -7,9 +7,16 @@ namespace NKC_WF.WebUserControls { public partial class cmp_devUtils : BaseUserControl { - protected void Page_Load(object sender, EventArgs e) - { + #region Protected Methods + protected void lbtResetNest_Click(object sender, EventArgs e) + { + DLMan.taBL.resetNesting(-9999); + } + + protected void lbtResetProd_Click(object sender, EventArgs e) + { + DLMan.taBL.resetProdCall(); } protected void lbtResetStackBuild_Click(object sender, EventArgs e) @@ -17,11 +24,6 @@ namespace NKC_WF.WebUserControls DLMan.taSHL.resetPrepared(-9999); } - protected void lbtResetNest_Click(object sender, EventArgs e) - { - DLMan.taBL.resetNesting(-9999); - } - protected void lbtSaveLastAnsw_Click(object sender, EventArgs e) { string content = ComLib.lastRestAnsw(); @@ -41,6 +43,13 @@ namespace NKC_WF.WebUserControls // 2020.01.16 salvo su mongoDb la risposta... ComLib.man.saveEstAnsw(rispStima); } + else if (batchProcAnsw.ProcType == 3) + { + // deserializzo come BatchreqIniziale (stima) + nestReplyBatchExtEst rispStima = JsonConvert.DeserializeObject(content); + // 2020.01.16 salvo su mongoDb la risposta... + ComLib.man.saveExtEstAnsw(rispStima); + } else { // deserializzo come BatchreqFinale @@ -52,9 +61,10 @@ namespace NKC_WF.WebUserControls } } - protected void lbtResetProd_Click(object sender, EventArgs e) + protected void Page_Load(object sender, EventArgs e) { - DLMan.taBL.resetProdCall(); } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/NKC_WF/site/KitRequestImporter.aspx.cs b/NKC_WF/site/KitRequestImporter.aspx.cs index 7569f73..af62bcb 100644 --- a/NKC_WF/site/KitRequestImporter.aspx.cs +++ b/NKC_WF/site/KitRequestImporter.aspx.cs @@ -1,40 +1,29 @@ using SteamWare; using System; +using System.IO; using System.Web.UI; - namespace NKC_WF { public partial class KitRequestImporter : BasePage { + #region Protected Fields + /// /// Folder REMOTA x copia verso SQL /// protected string _SqlCopyDir = memLayer.ML.CRS("_SqlCopyDir"); + /// /// Folder x SQL import /// protected string _SqlImportDir = memLayer.ML.CRS("_SqlImportDir"); - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - doUpdate(); - cmp_kitImpCheck.Visible = false; - } - cmp_kitImpCheck.eh_doRefresh += Cmp_kitImpCheck_eh_doRefresh; - cmp_kitImpCheck.eh_doReset += cmp_kitImpCheck_eh_doReset; - cmp_fileUpload.eh_doRefresh += Cmp_fileUpload_eh_doRefresh; - cmp_fileUpload.eh_FileUploaded += Cmp_fileUpload_eh_FileUploaded; - } + #endregion Protected Fields - private void cmp_kitImpCheck_eh_doReset(object sender, EventArgs e) - { - Response.Redirect(Request.RawUrl); - } + #region Private Methods - private void Cmp_kitImpCheck_eh_doRefresh(object sender, EventArgs e) + private void Cmp_fileUpload_eh_doRefresh(object sender, EventArgs e) { doUpdate(); } @@ -64,24 +53,65 @@ namespace NKC_WF // salvo dati cmp_kitImpCheck.fileName = e.FileName; cmp_kitImpCheck.batchName = e.BatchName; + + // pulizia eventuali vecchi file errore in "dirTo" + string[] file2del = Directory.GetFiles(dirTo, "error*"); + if (file2del.Length > 0) + { + logger.lg.scriviLog($"Trovati {file2del.Length} file errore, li elimino"); + foreach (var item in file2del) + { + File.Delete(item); + logger.lg.scriviLog($"Eliminato {item}"); + } + } + // chiamo procedure check... cmp_kitImpCheck.tryImport(true); doUpdate(); } - private void Cmp_fileUpload_eh_doRefresh(object sender, EventArgs e) + private void Cmp_kitImpCheck_eh_doRefresh(object sender, EventArgs e) { doUpdate(); } + private void cmp_kitImpCheck_eh_doReset(object sender, EventArgs e) + { + Response.Redirect(Request.RawUrl); + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + doUpdate(); + cmp_kitImpCheck.Visible = false; + } + cmp_kitImpCheck.eh_doRefresh += Cmp_kitImpCheck_eh_doRefresh; + cmp_kitImpCheck.eh_doReset += cmp_kitImpCheck_eh_doReset; + cmp_fileUpload.eh_doRefresh += Cmp_fileUpload_eh_doRefresh; + cmp_fileUpload.eh_FileUploaded += Cmp_fileUpload_eh_FileUploaded; + } + + protected void Timer1_Tick(object sender, EventArgs e) + { + doUpdate(); + } + + #endregion Protected Methods + + #region Public Methods public void doUpdate() { cmp_kitList.doUpdate(); } - protected void Timer1_Tick(object sender, EventArgs e) - { - doUpdate(); - } + + #endregion Public Methods } } \ No newline at end of file diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs index 91166fa..40245c7 100644 --- a/NKC_WF/site/OrderManager.aspx.cs +++ b/NKC_WF/site/OrderManager.aspx.cs @@ -2,40 +2,49 @@ using SteamWare; using System; using System.Collections.Generic; +using System.IO; using System.Web.UI; namespace NKC_WF { public partial class OrderManager : BasePage { + #region Protected Fields + /// /// Folder REMOTA x copia verso SQL /// protected string _SqlCopyDir = memLayer.ML.CRS("_SqlCopyDir"); + /// /// Folder x SQL import /// protected string _SqlImportDir = memLayer.ML.CRS("_SqlImportDir"); + /// /// Path base x nesting /// protected string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/"; + /// /// Path base x server /// protected string srvCadBasePath = $"{memLayer.ML.CRS("servBasePath")}{memLayer.ML.CRS("drawingFolder")}/"; - protected void Page_Load(object sender, EventArgs e) + #endregion Protected Fields + + #region Private Methods + + private void Cmp_batchList_eh_doRefresh(object sender, EventArgs e) { - if (!Page.IsPostBack) - { - ((SiteMaster)this.Master).showSearch = false; - doUpdate(); - } - cmp_batchList.eh_doRefresh += Cmp_batchList_eh_doRefresh; - cmp_fileUpload.eh_doRefresh += Cmp_fileUpload_eh_doRefresh; - cmp_fileUpload.eh_FileUploaded += Cmp_fileUpload_eh_FileUploaded; + doUpdate(); } + + private void Cmp_fileUpload_eh_doRefresh(object sender, EventArgs e) + { + doUpdate(); + } + /// /// Ora continuo processing /// @@ -43,7 +52,6 @@ namespace NKC_WF /// private void Cmp_fileUpload_eh_FileUploaded(object sender, WebUserContols.FileUploadEventArgs e) { - /*-------------------------------------------- * Note validazione: * - leggo cSV @@ -53,13 +61,13 @@ namespace NKC_WF * --> NON TROVATO --> creo record IV + record Batch stato 8, con KitID = OrdID = 0, DA VALUTARE!!! * - se valutazione tempo <= 1 sec --> NON VALIDO * - se valutazione tempo > 1 sec --> VALIDO - * + * * --> trovato - * - se valido --> check DXF, + * - se valido --> check DXF, * --> dxf ok --> finito * --> dxf non trovato --> NON VALIDO, segnalo errore su part * - se NON valido --> segnalo errore su part - * + * *--------------------------------------------*/ bool dataValidated = true; @@ -120,7 +128,19 @@ namespace NKC_WF DS_App.ImportLogDataTable tabDati = null; try { - // chiamo procedura SQL x import... + // pulizia eventuali vecchi file errore in "dirTo" + string[] file2del = Directory.GetFiles(dirTo, "error*"); + if (file2del.Length > 0) + { + logger.lg.scriviLog($"Trovati {file2del.Length} file errore, li elimino"); + foreach (var item in file2del) + { + File.Delete(item); + logger.lg.scriviLog($"Eliminato {item}"); + } + } + + // chiamo procedura SQL x import... tabDati = DLMan.taImpLog.importCsvOrd($"{dirImport}", e.FileName, e.BatchName, ";", "\n", "2", 0, 0, 0); } catch (Exception exc) @@ -167,6 +187,7 @@ namespace NKC_WF Response.Redirect(Request.RawUrl); //doUpdate(); } + /// /// Effettua validazione dati /// @@ -214,15 +235,26 @@ namespace NKC_WF return allOk; } - private void Cmp_fileUpload_eh_doRefresh(object sender, EventArgs e) + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) { - doUpdate(); + if (!Page.IsPostBack) + { + ((SiteMaster)this.Master).showSearch = false; + doUpdate(); + } + cmp_batchList.eh_doRefresh += Cmp_batchList_eh_doRefresh; + cmp_fileUpload.eh_doRefresh += Cmp_fileUpload_eh_doRefresh; + cmp_fileUpload.eh_FileUploaded += Cmp_fileUpload_eh_FileUploaded; } - private void Cmp_batchList_eh_doRefresh(object sender, EventArgs e) - { - doUpdate(); - } + #endregion Protected Methods + + #region Public Methods + /// /// Update interfaccia /// @@ -231,5 +263,6 @@ namespace NKC_WF cmp_batchList.doUpdate(); } + #endregion Public Methods } } \ No newline at end of file