From aed4292ce431c5402498b3c1b698d7a3c58246ae Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 25 Jul 2020 18:46:35 +0200 Subject: [PATCH 1/8] Update per refresh ajax KitReqImporter --- Jenkinsfile | 2 +- .../WebUserControls/cmp_kitImpCheck.ascx.cs | 4 + NKC_WF/site/KitRequestImporter.aspx | 19 ++-- NKC_WF/site/KitRequestImporter.aspx.cs | 10 +++ .../site/KitRequestImporter.aspx.designer.cs | 88 +++++++++++-------- 5 files changed, 81 insertions(+), 42 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f25b09a..e6bdf94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=296']) { + withEnv(['NEXT_BUILD_NUMBER=297']) { // env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs index 9ff42bc..a08be3d 100644 --- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs @@ -164,6 +164,10 @@ namespace NKC_WF.WebUserControls tryImport(false); } processValidation(); + if(imported) + { + raiseReset(); + } } } } \ No newline at end of file diff --git a/NKC_WF/site/KitRequestImporter.aspx b/NKC_WF/site/KitRequestImporter.aspx index c48428a..51afd0e 100644 --- a/NKC_WF/site/KitRequestImporter.aspx +++ b/NKC_WF/site/KitRequestImporter.aspx @@ -17,13 +17,20 @@
-
- -
-
- -
+ + +
+
+ +
+
+ +
+ +
+ + diff --git a/NKC_WF/site/KitRequestImporter.aspx.cs b/NKC_WF/site/KitRequestImporter.aspx.cs index a51cc5b..776636f 100644 --- a/NKC_WF/site/KitRequestImporter.aspx.cs +++ b/NKC_WF/site/KitRequestImporter.aspx.cs @@ -25,10 +25,16 @@ namespace NKC_WF 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; } + private void cmp_kitImpCheck_eh_doReset(object sender, EventArgs e) + { + Response.Redirect(Request.RawUrl); + } + private void Cmp_kitImpCheck_eh_doRefresh(object sender, EventArgs e) { doUpdate(); @@ -74,5 +80,9 @@ namespace NKC_WF { cmp_kitList.doUpdate(); } + protected void Timer1_Tick(object sender, EventArgs e) + { + doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/site/KitRequestImporter.aspx.designer.cs b/NKC_WF/site/KitRequestImporter.aspx.designer.cs index 49490d6..372ffe6 100644 --- a/NKC_WF/site/KitRequestImporter.aspx.designer.cs +++ b/NKC_WF/site/KitRequestImporter.aspx.designer.cs @@ -11,43 +11,61 @@ namespace NKC_WF { - public partial class KitRequestImporter - { + public partial class KitRequestImporter + { - /// - /// Controllo cmp_fileUpload. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload; + /// + /// Controllo cmp_fileUpload. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload; - /// - /// Controllo cmp_kitImpCheck. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_kitImpCheck cmp_kitImpCheck; + /// + /// Controllo UpdatePanel1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel1; - /// - /// Controllo divKitList. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divKitList; + /// + /// Controllo cmp_kitImpCheck. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_kitImpCheck cmp_kitImpCheck; - /// - /// Controllo cmp_kitList. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_kitList cmp_kitList; - } + /// + /// Controllo divKitList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divKitList; + + /// + /// Controllo cmp_kitList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_kitList cmp_kitList; + + /// + /// Controllo Timer1. + /// + /// + /// 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 Timer1; + } } From 27e6784f2e543c99470a30906120c8decb58f197 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 27 Jul 2020 15:05:32 +0200 Subject: [PATCH 2/8] Aggiunta chiamata x FIX KIT dei verniciati --- AppData/DS_App.Designer.cs | 36 +++++- AppData/DS_App.xsd | 105 ++++++++++-------- AppData/DS_App.xss | 22 ++-- .../WebUserControls/cmp_kittingSmart.ascx.cs | 2 + 4 files changed, 106 insertions(+), 59 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index ed4ed72..8844af3 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -30000,7 +30000,7 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki [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[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM KitList"; @@ -30024,6 +30024,12 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki 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("@KitID", 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("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_KL_updateCartForBin"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[4].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[4].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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -30245,6 +30251,34 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki public virtual int Update(int OrdID, int BatchID, int CartID, string KitExtCode, int Original_KitID, int Original_OrdID, int Original_BatchID, int Original_CartID, string Original_KitExtCode) { return this.Update(OrdID, BatchID, CartID, KitExtCode, Original_KitID, Original_OrdID, Original_BatchID, Original_CartID, Original_KitExtCode, Original_KitID); } + + [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 updateCartForBin(string CartDtmx) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + if ((CartDtmx == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CartDtmx)); + } + 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(); + } + } + return returnValue; + } } /// diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 5ac9949..e8119a3 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1583,6 +1583,17 @@ SELECT KitID, OrdID, BatchID, CartID, KitExtCode FROM KitList WHERE (KitID = @Ki + + + + dbo.stp_KL_updateCartForBin + + + + + + + @@ -2967,7 +2978,7 @@ FROM v_OKIB - + @@ -3017,7 +3028,7 @@ FROM v_OKIB - + @@ -3042,7 +3053,7 @@ FROM v_OKIB - + @@ -3097,7 +3108,7 @@ FROM v_OKIB - + @@ -3170,7 +3181,7 @@ FROM v_OKIB - + @@ -3178,7 +3189,7 @@ FROM v_OKIB - + @@ -3247,7 +3258,7 @@ FROM v_OKIB - + @@ -3280,7 +3291,7 @@ FROM v_OKIB - + @@ -3321,7 +3332,7 @@ FROM v_OKIB - + @@ -3340,7 +3351,7 @@ FROM v_OKIB - + @@ -3364,7 +3375,7 @@ FROM v_OKIB - + @@ -3372,7 +3383,7 @@ FROM v_OKIB - + @@ -3389,7 +3400,7 @@ FROM v_OKIB - + @@ -3398,7 +3409,7 @@ FROM v_OKIB - + @@ -3429,7 +3440,7 @@ FROM v_OKIB - + @@ -3437,7 +3448,7 @@ FROM v_OKIB - + @@ -3453,7 +3464,7 @@ FROM v_OKIB - + @@ -3461,7 +3472,7 @@ FROM v_OKIB - + @@ -3489,7 +3500,7 @@ FROM v_OKIB - + @@ -3525,7 +3536,7 @@ FROM v_OKIB - + @@ -3541,7 +3552,7 @@ FROM v_OKIB - + @@ -3551,7 +3562,7 @@ FROM v_OKIB - + @@ -3568,7 +3579,7 @@ FROM v_OKIB - + @@ -3581,7 +3592,7 @@ FROM v_OKIB - + @@ -3631,7 +3642,7 @@ FROM v_OKIB - + @@ -3660,7 +3671,7 @@ FROM v_OKIB - + @@ -3702,7 +3713,7 @@ FROM v_OKIB - + @@ -3811,7 +3822,7 @@ FROM v_OKIB - + @@ -3874,7 +3885,7 @@ FROM v_OKIB - + @@ -3919,7 +3930,7 @@ FROM v_OKIB - + @@ -3946,7 +3957,7 @@ FROM v_OKIB - + @@ -4039,7 +4050,7 @@ FROM v_OKIB - + @@ -4102,7 +4113,7 @@ FROM v_OKIB - + @@ -4161,7 +4172,7 @@ FROM v_OKIB - + @@ -4211,7 +4222,7 @@ FROM v_OKIB - + @@ -4368,18 +4379,18 @@ FROM v_OKIB - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 3028c59..38afcca 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. --> - + @@ -17,7 +17,7 @@ - + @@ -82,12 +82,12 @@ - 788 - 122 + 823 + 68 861 - 122 + 68 @@ -106,12 +106,12 @@ - 699 + 707 340 - 699 - 313 + 707 + 278 @@ -119,11 +119,11 @@ 550 - 151 + 97 - 604 - 151 + 612 + 97 diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index cffc385..56d0d63 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -327,6 +327,8 @@ namespace NKC_WF.WebUserControls DataLayer.man.taPLog.acquireCart(rawData, currIpAddress(), user_std.UtSn.userNameAD); displInfo($"OK: CART acquired {rawData} - item confirmed", true); lastObject = ""; + // eseguo comando x spostare i PAINT nel cart corretto... + DataLayer.man.taKL.updateCartForBin(rawData); } else { From 9ffd7422a738467aca32c7934269e1327210f2b5 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 27 Jul 2020 15:05:53 +0200 Subject: [PATCH 3/8] UPdate x fix gestioen UNLOAD --- AppData/DS_App.Designer.cs | 33 +--- AppData/DS_App.xsd | 5 +- NKC_WF/WebUserControls/cmp_kittingBin.ascx | 6 +- NKC_WF/site/MachineLoad.aspx | 51 +++--- NKC_WF/site/MachineLoad.aspx.cs | 8 +- NKC_WF/site/MachineLoad.aspx.designer.cs | 47 +++++- NKC_WF/site/MachineUnload.aspx | 68 +++++--- NKC_WF/site/MachineUnload.aspx.cs | 12 ++ NKC_WF/site/MachineUnload.aspx.designer.cs | 188 +++++++++++++-------- 9 files changed, 258 insertions(+), 160 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 8844af3..94cc8e6 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -10022,8 +10022,6 @@ namespace AppData { private global::System.Data.DataColumn columnCartID; - private global::System.Data.DataColumn columnBatchID; - private global::System.Data.DataColumn columnOrdID; private global::System.Data.DataColumn columnCartIndex; @@ -10101,14 +10099,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 OrdIDColumn { @@ -10292,7 +10282,6 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public CartOnKitRow AddCartOnKitRow( int CartID, - int BatchID, int OrdID, int CartIndex, string CartDtmx, @@ -10314,7 +10303,6 @@ namespace AppData { CartOnKitRow rowCartOnKitRow = ((CartOnKitRow)(this.NewRow())); object[] columnValuesArray = new object[] { CartID, - BatchID, OrdID, CartIndex, CartDtmx, @@ -10363,7 +10351,6 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal void InitVars() { this.columnCartID = base.Columns["CartID"]; - this.columnBatchID = base.Columns["BatchID"]; this.columnOrdID = base.Columns["OrdID"]; this.columnCartIndex = base.Columns["CartIndex"]; this.columnCartDtmx = base.Columns["CartDtmx"]; @@ -10389,8 +10376,6 @@ namespace AppData { private void InitClass() { this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartID); - 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.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element); @@ -10431,7 +10416,6 @@ namespace AppData { this.columnCartID}, true)); this.columnCartID.AllowDBNull = false; this.columnCartID.Unique = true; - this.columnBatchID.AllowDBNull = false; this.columnCartIndex.AllowDBNull = false; this.columnCartDtmx.ReadOnly = true; this.columnCartDtmx.MaxLength = 10; @@ -19485,17 +19469,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.tableCartOnKit.BatchIDColumn])); - } - set { - this[this.tableCartOnKit.BatchIDColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int OrdID { @@ -33532,7 +33505,6 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "CartOnKit"; tableMapping.ColumnMappings.Add("CartID", "CartID"); - tableMapping.ColumnMappings.Add("BatchID", "BatchID"); tableMapping.ColumnMappings.Add("OrdID", "OrdID"); tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); @@ -33567,7 +33539,10 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W 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 *\r\nFROM v_CartKitDetail"; + this._commandCollection[0].CommandText = "SELECT OrdID, CartID, CartIndex, CartDtmx, CreationDate, KittingStart, KittingEnd" + + ", TotItem, TotItemCart, TotItemBinReq, NumPzBinAvail, NumPzWaiting, OtherQtyReq," + + " OtherQtyCur, OtherQtyWait, OrderExtCode, DestPlant, ModelCode, KitQty FROM v_Ca" + + "rtKitDetail"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index e8119a3..22fed87 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2323,8 +2323,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - SELECT * -FROM v_CartKitDetail + SELECT OrdID, CartID, CartIndex, CartDtmx, CreationDate, KittingStart, KittingEnd, TotItem, TotItemCart, TotItemBinReq, NumPzBinAvail, NumPzWaiting, OtherQtyReq, OtherQtyCur, OtherQtyWait, OrderExtCode, DestPlant, ModelCode, KitQty FROM v_CartKitDetail @@ -2332,7 +2331,6 @@ FROM v_CartKitDetail - @@ -3596,7 +3594,6 @@ FROM v_OKIB - diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx b/NKC_WF/WebUserControls/cmp_kittingBin.ascx index 36217ad..d3b56da 100644 --- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx @@ -42,10 +42,8 @@
Qty:
-
- / - - +
+ /
diff --git a/NKC_WF/site/MachineLoad.aspx b/NKC_WF/site/MachineLoad.aspx index 96f4987..06b73eb 100644 --- a/NKC_WF/site/MachineLoad.aspx +++ b/NKC_WF/site/MachineLoad.aspx @@ -4,26 +4,37 @@ <%@ Register Src="~/WebUserControls/cmp_ML_ShDet.ascx" TagPrefix="uc1" TagName="cmp_ML_ShDet" %> -
-

<%: traduci("MachineLoad") %>

-
-
-
- + +
+

<%: traduci("MachineLoad") %>

+
+ + +
+
+ +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
- -
-
-
diff --git a/NKC_WF/site/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs index 1f5a2fe..d253933 100644 --- a/NKC_WF/site/MachineLoad.aspx.cs +++ b/NKC_WF/site/MachineLoad.aspx.cs @@ -9,8 +9,8 @@ namespace NKC_WF if (!Page.IsPostBack) { ((SiteContent)this.Master).showSearch = false; + forceRefresh(); } - forceRefresh(); cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh; } @@ -25,11 +25,15 @@ namespace NKC_WF cmp_ML_ShDet1.BatchId = cmp_stackLoading.BatchIdCurr; cmp_ML_ShDet2.BatchId = cmp_stackLoading.BatchIdCurr; cmp_ML_ShDet3.BatchId = cmp_stackLoading.BatchIdCurr; - // refresh vari! cmp_ML_ShDet.doUpdate(); cmp_ML_ShDet1.doUpdate(); cmp_ML_ShDet2.doUpdate(); cmp_ML_ShDet3.doUpdate(); } + + protected void timerLoad_Tick(object sender, EventArgs e) + { + forceRefresh(); + } } } \ 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 660d75f..1a4afa6 100644 --- a/NKC_WF/site/MachineLoad.aspx.designer.cs +++ b/NKC_WF/site/MachineLoad.aspx.designer.cs @@ -7,11 +7,31 @@ // //------------------------------------------------------------------------------ -namespace NKC_WF { - - - public partial class MachineLoad { - +namespace NKC_WF +{ + + + public partial class MachineLoad + { + + /// + /// Controllo timerLoad. + /// + /// + /// 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 timerLoad; + + /// + /// Controllo upnlBCode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlBCode; + /// /// Controllo cmp_stackLoading. /// @@ -20,7 +40,16 @@ namespace NKC_WF { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::NKC_WF.WebUserControls.cmp_stackLoading cmp_stackLoading; - + + /// + /// Controllo upnlLoad. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlLoad; + /// /// Controllo cmp_ML_ShDet. /// @@ -29,7 +58,7 @@ namespace NKC_WF { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet; - + /// /// Controllo cmp_ML_ShDet1. /// @@ -38,7 +67,7 @@ namespace NKC_WF { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet1; - + /// /// Controllo cmp_ML_ShDet2. /// @@ -47,7 +76,7 @@ namespace NKC_WF { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet2; - + /// /// Controllo cmp_ML_ShDet3. /// diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx index b34281d..424cf71 100644 --- a/NKC_WF/site/MachineUnload.aspx +++ b/NKC_WF/site/MachineUnload.aspx @@ -8,30 +8,48 @@ - - - - -
-
-

<%: traduci("MachineUnload") %> (<%: hfBatchID.Value %>)

-
- -
-
- -
-
- -
-
- -
+ + + + + +
+
+

<%: traduci("MachineUnload") %> (<%: hfBatchID.Value %>)

+
+ + + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ +
+
- -
-
-
- - + + diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index 1882ceb..2b09799 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -80,5 +80,17 @@ namespace NKC_WF BatchId = 0; } } + + protected void timerStats_Tick(object sender, EventArgs e) + { + cmp_MU_stats.doUpdate(); + cmp_MU_bins.doUpdate(); + cmp_MU_carts.doUpdate(); + } + + protected void timerSvg_Tick(object sender, EventArgs e) + { + doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/site/MachineUnload.aspx.designer.cs b/NKC_WF/site/MachineUnload.aspx.designer.cs index e8749b5..a39e413 100644 --- a/NKC_WF/site/MachineUnload.aspx.designer.cs +++ b/NKC_WF/site/MachineUnload.aspx.designer.cs @@ -11,79 +11,133 @@ namespace NKC_WF { - public partial class MachineUnload - { + public partial class MachineUnload + { - /// - /// Controllo hfBatchID. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfBatchID; + /// + /// Controllo hfBatchID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfBatchID; - /// - /// Controllo hfSheetID. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfSheetID; + /// + /// Controllo hfSheetID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfSheetID; - /// - /// Controllo upnlDrawings. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.UpdatePanel upnlDrawings; + /// + /// Controllo timerSvg. + /// + /// + /// 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 timerSvg; - /// - /// Controllo cmp_MU_stats. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_MU_stats cmp_MU_stats; + /// + /// Controllo UpdatePanel2. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel2; - /// - /// Controllo cmp_MU_bins. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins; + /// + /// Controllo upnlStats. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlStats; - /// - /// Controllo cmp_MU_svgViewer. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer; + /// + /// Controllo cmp_MU_stats. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_stats cmp_MU_stats; - /// - /// Controllo cmp_MU_carts. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts; + /// + /// Controllo timerStats. + /// + /// + /// 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 timerStats; - /// - /// Controllo cmp_MU_suggestions. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_MU_suggestions cmp_MU_suggestions; - } + /// + /// Controllo upnlBins. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlBins; + + /// + /// Controllo cmp_MU_bins. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins; + + /// + /// Controllo upnlDrawings. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlDrawings; + + /// + /// Controllo cmp_MU_svgViewer. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer; + + /// + /// Controllo upnlCarts. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlCarts; + + /// + /// Controllo cmp_MU_carts. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts; + + /// + /// Controllo cmp_MU_suggestions. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_suggestions cmp_MU_suggestions; + } } From ab345b35b286ea1d58a8cea9e4c6914aed31af26 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 27 Jul 2020 15:06:15 +0200 Subject: [PATCH 4/8] new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e6bdf94..71eecc8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=297']) { + withEnv(['NEXT_BUILD_NUMBER=298']) { // env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From d18bc84d0fa722b5d8fecb7cafb46a1885f6157d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 27 Jul 2020 15:12:35 +0200 Subject: [PATCH 5/8] Fix doppio caricamento CSV CNC --- NKC_WF/site/KitRequestImporter.aspx.cs | 1 - NKC_WF/site/OrderManager.aspx | 2 +- NKC_WF/site/OrderManager.aspx.cs | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NKC_WF/site/KitRequestImporter.aspx.cs b/NKC_WF/site/KitRequestImporter.aspx.cs index 776636f..5e78b13 100644 --- a/NKC_WF/site/KitRequestImporter.aspx.cs +++ b/NKC_WF/site/KitRequestImporter.aspx.cs @@ -20,7 +20,6 @@ namespace NKC_WF { if (!Page.IsPostBack) { - ((SiteMaster)this.Master).showSearch = false; doUpdate(); cmp_kitImpCheck.Visible = false; } diff --git a/NKC_WF/site/OrderManager.aspx b/NKC_WF/site/OrderManager.aspx index 7f40fdf..1d4b935 100644 --- a/NKC_WF/site/OrderManager.aspx +++ b/NKC_WF/site/OrderManager.aspx @@ -11,7 +11,7 @@
-
+
diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs index da10962..1d810f8 100644 --- a/NKC_WF/site/OrderManager.aspx.cs +++ b/NKC_WF/site/OrderManager.aspx.cs @@ -163,7 +163,8 @@ namespace NKC_WF catch { } } - doUpdate(); + Response.Redirect(Request.RawUrl); + //doUpdate(); } /// /// Effettua validazione dati From 126445fa466f46bd3b1b097fae46f6174f0225c7 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 27 Jul 2020 15:41:13 +0200 Subject: [PATCH 6/8] typo refresh --- AppData/DS_App.Designer.cs | 81 ++++---------- AppData/DS_App.xsd | 100 +++++++++--------- AppData/DS_App.xss | 4 +- .../WebUserControls/cmp_kittingSmart.ascx.cs | 2 +- 4 files changed, 71 insertions(+), 116 deletions(-) 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(); From 0a04e1c6a4d08d51be0d0eccc5543d8a4647961f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 27 Jul 2020 16:08:59 +0200 Subject: [PATCH 7/8] bozza timer post kitting --- NKC_WF/site/Kitting.aspx | 13 +++++++++---- NKC_WF/site/Kitting.aspx.cs | 6 ++++++ NKC_WF/site/Kitting.aspx.designer.cs | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/NKC_WF/site/Kitting.aspx b/NKC_WF/site/Kitting.aspx index 3f604ee..b3a30dc 100644 --- a/NKC_WF/site/Kitting.aspx +++ b/NKC_WF/site/Kitting.aspx @@ -6,8 +6,13 @@ -
- - -
+ + + +
+ + +
+ + diff --git a/NKC_WF/site/Kitting.aspx.cs b/NKC_WF/site/Kitting.aspx.cs index 0f0c419..870cbb0 100644 --- a/NKC_WF/site/Kitting.aspx.cs +++ b/NKC_WF/site/Kitting.aspx.cs @@ -12,5 +12,11 @@ namespace NKC_WF.site ((SiteMaster)this.Master).showSearch = false; } } + + protected void timerKitting_Tick(object sender, EventArgs e) + { + cmp_kitRunning.doUpdate(); + cmp_kitting.doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/site/Kitting.aspx.designer.cs b/NKC_WF/site/Kitting.aspx.designer.cs index 4f517a0..c2cbc7b 100644 --- a/NKC_WF/site/Kitting.aspx.designer.cs +++ b/NKC_WF/site/Kitting.aspx.designer.cs @@ -14,6 +14,24 @@ namespace NKC_WF.site public partial class Kitting { + /// + /// Controllo timerKitting. + /// + /// + /// 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 timerKitting; + + /// + /// Controllo UpdatePanel2. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel2; + /// /// Controllo cmp_kitRunning. /// From 591c653fb6d3bb477eba3aab9cddf871d30de648 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 27 Jul 2020 16:13:06 +0200 Subject: [PATCH 8/8] Fix update kitting station --- NKC_WF/WebUserControls/cmp_kitting.ascx.cs | 6 ++++++ NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs | 5 +++++ NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/NKC_WF/WebUserControls/cmp_kitting.ascx.cs b/NKC_WF/WebUserControls/cmp_kitting.ascx.cs index 4778704..12dcdc9 100644 --- a/NKC_WF/WebUserControls/cmp_kitting.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitting.ascx.cs @@ -8,5 +8,11 @@ namespace NKC_WF.WebUserControls { } + + public void doUpdate() + { + cmp_kittingBin.doUpdate(); + cmp_kittingCart.doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs index 067eb8a..8e68db6 100644 --- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs @@ -8,5 +8,10 @@ namespace NKC_WF.WebUserControls { } + + public void doUpdate() + { + repBins.DataBind(); + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs index bcd5447..84dde93 100644 --- a/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs @@ -34,5 +34,10 @@ namespace NKC_WF.WebUserControls } return answ; } + + public void doUpdate() + { + repCarts.DataBind(); + } } } \ No newline at end of file