diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 94cc8e6..1ac7f41 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -12826,14 +12826,12 @@ namespace AppData { [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] public partial class PackCheckDataTable : global::System.Data.TypedTableBase { - private global::System.Data.DataColumn columnBatchID; + private global::System.Data.DataColumn columnCartID; private global::System.Data.DataColumn columnBatchName; private global::System.Data.DataColumn columnOrdID; - private global::System.Data.DataColumn columnCartID; - private global::System.Data.DataColumn columnCartDtmx; private global::System.Data.DataColumn columnNumTot; @@ -12879,9 +12877,9 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn BatchIDColumn { + public global::System.Data.DataColumn CartIDColumn { get { - return this.columnBatchID; + return this.columnCartID; } } @@ -12901,14 +12899,6 @@ namespace AppData { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn CartIDColumn { - get { - return this.columnCartID; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn CartDtmxColumn { @@ -12986,13 +12976,12 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public PackCheckRow AddPackCheckRow(int BatchID, string BatchName, int OrdID, string CartDtmx, int NumTot, int NumProd, int NumKit, int NumPenalty) { + public PackCheckRow AddPackCheckRow(string BatchName, int OrdID, string CartDtmx, int NumTot, int NumProd, int NumKit, int NumPenalty) { PackCheckRow rowPackCheckRow = ((PackCheckRow)(this.NewRow())); object[] columnValuesArray = new object[] { - BatchID, + null, BatchName, OrdID, - null, CartDtmx, NumTot, NumProd, @@ -13020,10 +13009,9 @@ namespace AppData { [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.columnCartID = base.Columns["CartID"]; this.columnBatchName = base.Columns["BatchName"]; this.columnOrdID = base.Columns["OrdID"]; - this.columnCartID = base.Columns["CartID"]; this.columnCartDtmx = base.Columns["CartDtmx"]; this.columnNumTot = base.Columns["NumTot"]; this.columnNumProd = base.Columns["NumProd"]; @@ -13034,14 +13022,12 @@ namespace AppData { [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.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCartID); this.columnBatchName = new global::System.Data.DataColumn("BatchName", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnBatchName); this.columnOrdID = new global::System.Data.DataColumn("OrdID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOrdID); - this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnCartID); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartDtmx); this.columnNumTot = new global::System.Data.DataColumn("NumTot", typeof(int), null, global::System.Data.MappingType.Element); @@ -13054,13 +13040,13 @@ namespace AppData { base.Columns.Add(this.columnNumPenalty); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCartID}, false)); - this.columnBatchName.AllowDBNull = false; - this.columnBatchName.MaxLength = 50; this.columnCartID.AutoIncrement = true; this.columnCartID.AutoIncrementSeed = -1; this.columnCartID.AutoIncrementStep = -1; this.columnCartID.ReadOnly = true; this.columnCartID.Unique = true; + this.columnBatchName.AllowDBNull = false; + this.columnBatchName.MaxLength = 50; this.columnCartDtmx.ReadOnly = true; this.columnCartDtmx.MaxLength = 10; this.columnNumTot.ReadOnly = true; @@ -20962,17 +20948,17 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int BatchID { + public int CartID { get { try { - return ((int)(this[this.tablePackCheck.BatchIDColumn])); + return ((int)(this[this.tablePackCheck.CartIDColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'BatchID\' nella tabella \'PackCheck\' è DBNull.", e); + throw new global::System.Data.StrongTypingException("Il valore della colonna \'CartID\' nella tabella \'PackCheck\' è DBNull.", e); } } set { - this[this.tablePackCheck.BatchIDColumn] = value; + this[this.tablePackCheck.CartIDColumn] = value; } } @@ -21003,22 +20989,6 @@ namespace AppData { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int CartID { - get { - try { - return ((int)(this[this.tablePackCheck.CartIDColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'CartID\' nella tabella \'PackCheck\' è DBNull.", e); - } - } - set { - this[this.tablePackCheck.CartIDColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string CartDtmx { @@ -21101,14 +21071,14 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsBatchIDNull() { - return this.IsNull(this.tablePackCheck.BatchIDColumn); + public bool IsCartIDNull() { + return this.IsNull(this.tablePackCheck.CartIDColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetBatchIDNull() { - this[this.tablePackCheck.BatchIDColumn] = global::System.Convert.DBNull; + public void SetCartIDNull() { + this[this.tablePackCheck.CartIDColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -21123,18 +21093,6 @@ namespace AppData { this[this.tablePackCheck.OrdIDColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsCartIDNull() { - return this.IsNull(this.tablePackCheck.CartIDColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetCartIDNull() { - this[this.tablePackCheck.CartIDColumn] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsCartDtmxNull() { @@ -35080,10 +35038,9 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "PackCheck"; - tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + tableMapping.ColumnMappings.Add("CartID", "CartID"); tableMapping.ColumnMappings.Add("BatchName", "BatchName"); tableMapping.ColumnMappings.Add("OrdID", "OrdID"); - tableMapping.ColumnMappings.Add("CartID", "CartID"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); tableMapping.ColumnMappings.Add("NumTot", "NumTot"); tableMapping.ColumnMappings.Add("NumProd", "NumProd"); diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 22fed87..67ad89e 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2689,10 +2689,9 @@ FROM v_PackListDet - + - @@ -2976,7 +2975,7 @@ FROM v_OKIB - + @@ -3026,7 +3025,7 @@ FROM v_OKIB - + @@ -3051,7 +3050,7 @@ FROM v_OKIB - + @@ -3106,7 +3105,7 @@ FROM v_OKIB - + @@ -3179,7 +3178,7 @@ FROM v_OKIB - + @@ -3187,7 +3186,7 @@ FROM v_OKIB - + @@ -3256,7 +3255,7 @@ FROM v_OKIB - + @@ -3289,7 +3288,7 @@ FROM v_OKIB - + @@ -3330,7 +3329,7 @@ FROM v_OKIB - + @@ -3349,7 +3348,7 @@ FROM v_OKIB - + @@ -3373,7 +3372,7 @@ FROM v_OKIB - + @@ -3381,7 +3380,7 @@ FROM v_OKIB - + @@ -3398,7 +3397,7 @@ FROM v_OKIB - + @@ -3407,7 +3406,7 @@ FROM v_OKIB - + @@ -3438,7 +3437,7 @@ FROM v_OKIB - + @@ -3446,7 +3445,7 @@ FROM v_OKIB - + @@ -3462,7 +3461,7 @@ FROM v_OKIB - + @@ -3470,7 +3469,7 @@ FROM v_OKIB - + @@ -3498,7 +3497,7 @@ FROM v_OKIB - + @@ -3534,7 +3533,7 @@ FROM v_OKIB - + @@ -3550,7 +3549,7 @@ FROM v_OKIB - + @@ -3560,7 +3559,7 @@ FROM v_OKIB - + @@ -3577,7 +3576,7 @@ FROM v_OKIB - + @@ -3590,7 +3589,7 @@ FROM v_OKIB - + @@ -3639,7 +3638,7 @@ FROM v_OKIB - + @@ -3668,7 +3667,7 @@ FROM v_OKIB - + @@ -3710,7 +3709,7 @@ FROM v_OKIB - + @@ -3819,7 +3818,7 @@ FROM v_OKIB - + @@ -3882,7 +3881,7 @@ FROM v_OKIB - + @@ -3927,10 +3926,10 @@ FROM v_OKIB - + - + @@ -3939,7 +3938,6 @@ FROM v_OKIB - @@ -3954,7 +3952,7 @@ FROM v_OKIB - + @@ -4047,7 +4045,7 @@ FROM v_OKIB - + @@ -4110,7 +4108,7 @@ FROM v_OKIB - + @@ -4169,7 +4167,7 @@ FROM v_OKIB - + @@ -4219,7 +4217,7 @@ FROM v_OKIB - + @@ -4376,18 +4374,18 @@ FROM v_OKIB - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 38afcca..093e140 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -35,7 +35,7 @@ - + diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 56d0d63..62f40bb 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -282,7 +282,7 @@ namespace NKC_WF.WebUserControls var tabLog = DataLayer.man.taPLog.getByCartId(codeInt); if (tabLog.Count > 0) { - // verifico se sia completo -_> reset... altrimenti lascio così... + // verifico se sia completo --> reset... altrimenti lascio così... var tabCOK = DataLayer.man.taCOK.GetData(); // cerco se sia "green" numWait + numReady + numOtherWait = 0 var tabGreen = tabCOK.Where(x => (x.NumPzWaiting + x.NumPzBinAvail + x.OtherQtyWait == 0) && x.CartDtmx == rawData).ToList();