From 361fc7424179e7cc8567ffb0bfd5598dec342203 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 18:27:56 +0200 Subject: [PATCH] Fix funzioni reload in LOD SMART & non --- AppData/DS_App.Designer.cs | 47 +++++-------------- AppData/DS_App.xsd | 8 ++-- AppData/DS_App.xss | 8 ++-- NKC_SDK/Objects.cs | 2 +- .../WebUserControls/cmp_kittingSmart.ascx.cs | 37 --------------- .../WebUserControls/cmp_stackLoading.ascx.cs | 2 +- NKC_WF/site/MachineLoad.aspx | 1 + NKC_WF/site/MachineLoad.aspx.cs | 7 ++- NKC_WF/site/MachineLoad.aspx.designer.cs | 9 ++++ 9 files changed, 36 insertions(+), 85 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index b2f762b..2089b0e 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -14967,8 +14967,6 @@ namespace AppData { private global::System.Data.DataColumn columnNumPicked; - private global::System.Data.DataColumn columnBatchID; - private global::System.Data.DataColumn columnCartDtmx; private global::System.Data.DataColumn columnCartIndex; @@ -15082,14 +15080,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 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 CartDtmxColumn { @@ -15159,7 +15149,7 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OKOI_sumRow AddOKOI_sumRow(int OtherItemID, int CartID, string OtherItemExtCode, string OtherItemDesc, string OtherItemDtmx, int OrdID, string OrderExtCode, int NumItems, int NumPicked, int BatchID, string CartDtmx, int CartIndex, System.DateTime CartKitStart, System.DateTime CartKitEnd) { + public OKOI_sumRow AddOKOI_sumRow(int OtherItemID, int CartID, string OtherItemExtCode, string OtherItemDesc, string OtherItemDtmx, int OrdID, string OrderExtCode, int NumItems, int NumPicked, string CartDtmx, int CartIndex, System.DateTime CartKitStart, System.DateTime CartKitEnd) { OKOI_sumRow rowOKOI_sumRow = ((OKOI_sumRow)(this.NewRow())); object[] columnValuesArray = new object[] { OtherItemID, @@ -15171,7 +15161,6 @@ namespace AppData { OrderExtCode, NumItems, NumPicked, - BatchID, CartDtmx, CartIndex, CartKitStart, @@ -15183,11 +15172,11 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OKOI_sumRow FindByBatchIDCartIDOtherItemID(int BatchID, int CartID, int OtherItemID) { + public OKOI_sumRow FindByOtherItemIDOrdIDCartID(int OtherItemID, int OrdID, int CartID) { return ((OKOI_sumRow)(this.Rows.Find(new object[] { - BatchID, - CartID, - OtherItemID}))); + OtherItemID, + OrdID, + CartID}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15216,7 +15205,6 @@ namespace AppData { this.columnOrderExtCode = base.Columns["OrderExtCode"]; this.columnNumItems = base.Columns["NumItems"]; this.columnNumPicked = base.Columns["NumPicked"]; - this.columnBatchID = base.Columns["BatchID"]; this.columnCartDtmx = base.Columns["CartDtmx"]; this.columnCartIndex = base.Columns["CartIndex"]; this.columnCartKitStart = base.Columns["CartKitStart"]; @@ -15244,8 +15232,6 @@ namespace AppData { base.Columns.Add(this.columnNumItems); this.columnNumPicked = new global::System.Data.DataColumn("NumPicked", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumPicked); - this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnBatchID); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartDtmx); this.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element); @@ -15255,9 +15241,9 @@ namespace AppData { this.columnCartKitEnd = new global::System.Data.DataColumn("CartKitEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartKitEnd); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { - this.columnBatchID, - this.columnCartID, - this.columnOtherItemID}, true)); + this.columnOtherItemID, + this.columnOrdID, + this.columnCartID}, true)); this.columnOtherItemID.AllowDBNull = false; this.columnCartID.AllowDBNull = false; this.columnOtherItemExtCode.AllowDBNull = false; @@ -15268,7 +15254,6 @@ namespace AppData { this.columnOrdID.AllowDBNull = false; this.columnOrderExtCode.AllowDBNull = false; this.columnOrderExtCode.MaxLength = 250; - this.columnBatchID.AllowDBNull = false; this.columnCartDtmx.ReadOnly = true; this.columnCartDtmx.MaxLength = 10; this.columnCartIndex.AllowDBNull = false; @@ -22486,17 +22471,6 @@ namespace AppData { } } - [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.tableOKOI_sum.BatchIDColumn])); - } - set { - this[this.tableOKOI_sum.BatchIDColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string CartDtmx { @@ -35922,7 +35896,6 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); tableMapping.ColumnMappings.Add("NumItems", "NumItems"); tableMapping.ColumnMappings.Add("NumPicked", "NumPicked"); - tableMapping.ColumnMappings.Add("BatchID", "BatchID"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); tableMapping.ColumnMappings.Add("CartKitStart", "CartKitStart"); @@ -35943,7 +35916,9 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W 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 v_OKOI_sum"; + this._commandCollection[0].CommandText = "SELECT OtherItemID, CartID, OtherItemExtCode, OtherItemDesc, OtherItemDtmx, OrdID" + + ", OrderExtCode, NumItems, NumPicked, CartDtmx, CartIndex, CartKitStart, CartKitE" + + "nd FROM v_OKOI_sum"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index ee97f75..e1d9d37 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2875,7 +2875,7 @@ FROM v_OKIB - SELECT * FROM v_OKOI_sum + SELECT OtherItemID, CartID, OtherItemExtCode, OtherItemDesc, OtherItemDtmx, OrdID, OrderExtCode, NumItems, NumPicked, CartDtmx, CartIndex, CartKitStart, CartKitEnd FROM v_OKOI_sum @@ -2891,7 +2891,6 @@ FROM v_OKIB - @@ -4203,7 +4202,6 @@ FROM v_OKIB - @@ -4363,9 +4361,9 @@ FROM v_OKIB - - + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 22e4273..1ba117b 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -19,7 +19,7 @@ - + @@ -38,9 +38,9 @@ - - - + + + diff --git a/NKC_SDK/Objects.cs b/NKC_SDK/Objects.cs index 266e36f..5322da8 100644 --- a/NKC_SDK/Objects.cs +++ b/NKC_SDK/Objects.cs @@ -47,7 +47,7 @@ namespace NKC_SDK /// public int ProcType { get; set; } /// - /// Codice della amcchina x cui si effettua richeista + /// Codice della macchina x cui si effettua richeista /// [JsonConverter(typeof(StringEnumConverter))] public mType MachineType { get; set; } diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index f201b6d..31a06d7 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -469,43 +469,6 @@ namespace NKC_WF.WebUserControls - -#if false - ar tabOKI = DataLayer.man.taOKOI.getByOtherItemDtmx(rawData); - // PRIMO: verifico SE ho delle righe valide... - if (tabOKI.Count == 0) - { - displError($"PART: Code not found {rawData}, please retry", true); - // reset preliminare - resetOtherItem(); - } - else - { - var listAvailable = tabOKI.Where(x => x.IsOnCartDateNull()).ToList(); - if (listAvailable.Count == 0) - { - displError($"PART: No item available for pickup on target CART for code {rawData} | item {tabOKI[0].OtherItemDesc} | order {tabOKI[0].OrderExtCode}, please retry", true); - // reset preliminare - resetOtherItem(); - } - else - { - // verifico SE ci sia ALMENO UN CART in postazione (iniziato KIT ma NON finito)... - var listCartAvailable = tabOKI.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList(); - if (listCartAvailable.Count == 0) - { - displError($"PART: No CART available to proceed: {rawData} | item {tabOKI[0].OtherItemDesc} | order {tabOKI[0].OrderExtCode}", true); - // reset preliminare - resetOtherItem(); - } - else - { - // mostro OtherItem! - setOtherItem(rawData, codeInt); - } - } - } -#endif break; case codeType.OtherItem: // recupero la tab OKOI x iniziare a controllare i dati... diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 6ac4a1b..1aef1af 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -280,7 +280,7 @@ namespace NKC_WF.WebUserControls lblLoaded.Visible = StackId != 0; frmView.Visible = !lblLoaded.Visible && !enableBCode; // fix div di simulazione - divSim.Visible = (memLayer.ML.CRS("environment") == "DEV"); + divSim.Visible = (memLayer.ML.CRS("environment") == "DEV" && !enableBCode); } public void doUpdate() diff --git a/NKC_WF/site/MachineLoad.aspx b/NKC_WF/site/MachineLoad.aspx index 8049e10..302afc4 100644 --- a/NKC_WF/site/MachineLoad.aspx +++ b/NKC_WF/site/MachineLoad.aspx @@ -8,6 +8,7 @@

<%: traduci("MachineLoad") %>

+ diff --git a/NKC_WF/site/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs index a0e1a2e..e4e6376 100644 --- a/NKC_WF/site/MachineLoad.aspx.cs +++ b/NKC_WF/site/MachineLoad.aspx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; namespace NKC_WF { @@ -36,5 +37,9 @@ namespace NKC_WF { forceRefresh(); } + protected void timerLong_Tick(object sender, EventArgs e) + { + Response.Redirect(Request.RawUrl); + } } } \ No newline at end of file diff --git a/NKC_WF/site/MachineLoad.aspx.designer.cs b/NKC_WF/site/MachineLoad.aspx.designer.cs index be820d3..5d6c35f 100644 --- a/NKC_WF/site/MachineLoad.aspx.designer.cs +++ b/NKC_WF/site/MachineLoad.aspx.designer.cs @@ -14,6 +14,15 @@ namespace NKC_WF public partial class MachineLoad { + /// + /// Controllo timerLong. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer timerLong; + /// /// Controllo upnlBCode. ///