From eb8a85a7410f22f1262d47fca350120f28fb533f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 12:26:42 +0200 Subject: [PATCH 1/8] Aggiunta task confronto vocabolario --- DB/SqlDataCompare_Vocab.dcmp | 66 ++++++++++++++++++++++++++++++++++++ NKC_WF.sln | 1 + 2 files changed, 67 insertions(+) create mode 100644 DB/SqlDataCompare_Vocab.dcmp diff --git a/DB/SqlDataCompare_Vocab.dcmp b/DB/SqlDataCompare_Vocab.dcmp new file mode 100644 index 0000000..c615012 --- /dev/null +++ b/DB/SqlDataCompare_Vocab.dcmp @@ -0,0 +1,66 @@ + + + 10 + + Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Pooling=False + SQL2016DEV.Sauder_NKC (sa) + + + Data Source=WIN2016-SQL\PROD;Initial Catalog=Sauder_NKC_Prod;Persist Security Info=True;User ID=sa;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=False + WIN2016-SQL\PROD.Sauder_NKC_Prod (sa) + + Default + [dbo].[AnagDevices] + [dbo].[AnagItemStatus] + [dbo].[AnagOpr] + [dbo].[BatchList] + [dbo].[BatchReqList_OLD] + [dbo].[BinList] + [dbo].[Bins] + [dbo].[Carts] + [dbo].[Clients] + [dbo].[Config] + [dbo].[ConfSetValues] + [dbo].[CountAssigned] + [dbo].[Counters] + [dbo].[DIRITTI] + [dbo].[ElencoPostazioni] + [dbo].[ErrorsLog] + [dbo].[FinalKit] + [dbo].[FUNZIONE] + [dbo].[Import_Log] + [dbo].[ItemEvents] + [dbo].[ItemList] + [dbo].[ItemValidation] + [dbo].[Kit2OtherItem] + [dbo].[KitList] + [dbo].[Lingue] + [dbo].[Materials] + [dbo].[MODULO] + [dbo].[Nesting] + [dbo].[OfflineOrderList] + [dbo].[OffOrd2Item] + [dbo].[Order2FinalKit] + [dbo].[OrderList] + [dbo].[OtherItemList] + [dbo].[Pack2Kit] + [dbo].[PackList] + [dbo].[PackListDet] + [dbo].[PackLog] + [dbo].[Permessi] + [dbo].[Permessi2Funzione] + [dbo].[Places] + [dbo].[PrintJobQueue] + [dbo].[Processes] + [dbo].[Remnants] + [dbo].[ReplOrders] + [dbo].[SheetList] + [dbo].[Stacklist] + [dbo].[TallyTable] + [dbo].[UTENTE] + [dbo].[Utenti] + [ext].[BatchKitting] + [ext].[BatchOrder] + [raw].[ItemList] + [raw].[OrderList] + \ No newline at end of file diff --git a/NKC_WF.sln b/NKC_WF.sln index 6955989..ed2e468 100644 --- a/NKC_WF.sln +++ b/NKC_WF.sln @@ -14,6 +14,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AF976E24-B296-403D-BCDA-6574E7B2F1DC}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + DB\SqlDataCompare_Vocab.dcmp = DB\SqlDataCompare_Vocab.dcmp EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NKC-IO", "NKC-IO\NKC-IO.csproj", "{4CA4B5AA-5AEF-4856-B95D-E699BE07B0B4}" From bb7be5b3ee23338fc12d1b8dfd2291bd2c33620b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 12:26:56 +0200 Subject: [PATCH 2/8] Aggiunta visualizzazione update msg durante download --- NKC_WF/site/UpdMan.aspx | 104 +++++++++++++++------------- NKC_WF/site/UpdMan.aspx.designer.cs | 9 +++ 2 files changed, 65 insertions(+), 48 deletions(-) diff --git a/NKC_WF/site/UpdMan.aspx b/NKC_WF/site/UpdMan.aspx index 4dde49d..79b440a 100644 --- a/NKC_WF/site/UpdMan.aspx +++ b/NKC_WF/site/UpdMan.aspx @@ -1,56 +1,64 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="UpdMan.aspx.cs" Inherits="NKC_WF.site.UpdMan" %> + - -
-
-
-
-

SteamWare's Updater

-
-
-
-
-
-

Gestione Update pacchetti - Ultime release applicazioni.

-
-
-
-
-

ALL

-
-
- LATEST VERS -
+ +
+
+
+
+

SteamWare's Updater

+
-
-
-
-
-

NKC

-
-
- <%: Version("NKC") %> -
+
+
+
+

Gestione Update pacchetti - Ultime release applicazioni.

+
+
+
+
+

ALL

+
+
+ LATEST VERS +
+
+
+
+
+
+

NKC

+
+
+ <%: Version("NKC") %> +
+
+
+
+
+
+

ZCode

+
+
+ <%: Version("ZCODE") %> +
+
+
+
+
+
+ + +
+ <%: traduci("TaskRunning") %> +
+ + + +
+
-
-
-
-
-

ZCode

-
-
- <%: Version("ZCODE") %> -
-
-
-
-
- -
-
-
-
diff --git a/NKC_WF/site/UpdMan.aspx.designer.cs b/NKC_WF/site/UpdMan.aspx.designer.cs index 0b867b2..02a7432 100644 --- a/NKC_WF/site/UpdMan.aspx.designer.cs +++ b/NKC_WF/site/UpdMan.aspx.designer.cs @@ -41,6 +41,15 @@ namespace NKC_WF.site /// protected global::System.Web.UI.WebControls.LinkButton lbtDownloadZCode; + /// + /// Controllo UpdateProgressDisplay. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay; + /// /// Controllo lblOut. /// From 8d8095ab2d83af40b488d46e48ce8a53ad1f323d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 14:08:08 +0200 Subject: [PATCH 3/8] Fix display errore in import --- Jenkinsfile | 2 +- NKC_WF/WebUserControls/cmp_kitImpCheck.ascx | 4 +--- NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 17adf39..24c49f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=314']) { + withEnv(['NEXT_BUILD_NUMBER=315']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${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 b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx index a2b4c42..981591e 100644 --- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx +++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx @@ -16,9 +16,7 @@
Last Action
- - # <%: traduci("PositiveAction") %> - +
diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs index a08be3d..6409b12 100644 --- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs @@ -157,8 +157,7 @@ namespace NKC_WF.WebUserControls protected void lbtDoAction_Click(object sender, EventArgs e) { - // in base a cosa ho in memoria procedo con successivo step, qui FAKE... - //if (!imported) + // in base a cosa ho in memoria procedo con successivo step if (checkOk && !imported) { tryImport(false); From f9dbb2471233c83109b2e9baa686955af460d764 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 17:37:16 +0200 Subject: [PATCH 4/8] Fix gestione KIT SMART --- AppData/DS_App.Designer.cs | 4 +- AppData/DS_App.xsd | 95 ++++++++++---------- AppData/DS_App.xss | 62 ++++++------- NKC_WF/site/KitRequestSched.aspx | 11 ++- NKC_WF/site/KitRequestSched.aspx.cs | 5 ++ NKC_WF/site/KitRequestSched.aspx.designer.cs | 18 ++++ 6 files changed, 113 insertions(+), 82 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 1ac7f41..b2f762b 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -15183,8 +15183,9 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OKOI_sumRow FindByCartIDOtherItemID(int CartID, int OtherItemID) { + public OKOI_sumRow FindByBatchIDCartIDOtherItemID(int BatchID, int CartID, int OtherItemID) { return ((OKOI_sumRow)(this.Rows.Find(new object[] { + BatchID, CartID, OtherItemID}))); } @@ -15254,6 +15255,7 @@ 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.AllowDBNull = false; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 67ad89e..ee97f75 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2975,7 +2975,7 @@ FROM v_OKIB - + @@ -3025,7 +3025,7 @@ FROM v_OKIB - + @@ -3050,7 +3050,7 @@ FROM v_OKIB - + @@ -3105,7 +3105,7 @@ FROM v_OKIB - + @@ -3178,7 +3178,7 @@ FROM v_OKIB - + @@ -3186,7 +3186,7 @@ FROM v_OKIB - + @@ -3255,7 +3255,7 @@ FROM v_OKIB - + @@ -3288,7 +3288,7 @@ FROM v_OKIB - + @@ -3329,7 +3329,7 @@ FROM v_OKIB - + @@ -3348,7 +3348,7 @@ FROM v_OKIB - + @@ -3372,7 +3372,7 @@ FROM v_OKIB - + @@ -3380,7 +3380,7 @@ FROM v_OKIB - + @@ -3397,7 +3397,7 @@ FROM v_OKIB - + @@ -3406,7 +3406,7 @@ FROM v_OKIB - + @@ -3437,7 +3437,7 @@ FROM v_OKIB - + @@ -3445,7 +3445,7 @@ FROM v_OKIB - + @@ -3461,7 +3461,7 @@ FROM v_OKIB - + @@ -3469,7 +3469,7 @@ FROM v_OKIB - + @@ -3497,7 +3497,7 @@ FROM v_OKIB - + @@ -3533,7 +3533,7 @@ FROM v_OKIB - + @@ -3549,7 +3549,7 @@ FROM v_OKIB - + @@ -3559,7 +3559,7 @@ FROM v_OKIB - + @@ -3576,7 +3576,7 @@ FROM v_OKIB - + @@ -3589,7 +3589,7 @@ FROM v_OKIB - + @@ -3638,7 +3638,7 @@ FROM v_OKIB - + @@ -3667,7 +3667,7 @@ FROM v_OKIB - + @@ -3709,7 +3709,7 @@ FROM v_OKIB - + @@ -3818,7 +3818,7 @@ FROM v_OKIB - + @@ -3881,7 +3881,7 @@ FROM v_OKIB - + @@ -3926,7 +3926,7 @@ FROM v_OKIB - + @@ -3952,7 +3952,7 @@ FROM v_OKIB - + @@ -4045,7 +4045,7 @@ FROM v_OKIB - + @@ -4108,7 +4108,7 @@ FROM v_OKIB - + @@ -4167,7 +4167,7 @@ FROM v_OKIB - + @@ -4217,7 +4217,7 @@ FROM v_OKIB - + @@ -4363,6 +4363,7 @@ FROM v_OKIB + @@ -4374,18 +4375,18 @@ FROM v_OKIB - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 093e140..22e4273 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -6,41 +6,41 @@ --> - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -127,7 +127,7 @@ - + 1129 @@ -163,7 +163,7 @@ - + 131 @@ -175,7 +175,7 @@ - + 352 diff --git a/NKC_WF/site/KitRequestSched.aspx b/NKC_WF/site/KitRequestSched.aspx index bd408fd..474e9e4 100644 --- a/NKC_WF/site/KitRequestSched.aspx +++ b/NKC_WF/site/KitRequestSched.aspx @@ -12,10 +12,15 @@

<%: traduci("KitRequestSched") %>

-
+
- - + + + + + + +
diff --git a/NKC_WF/site/KitRequestSched.aspx.cs b/NKC_WF/site/KitRequestSched.aspx.cs index d05dfdf..e7051e2 100644 --- a/NKC_WF/site/KitRequestSched.aspx.cs +++ b/NKC_WF/site/KitRequestSched.aspx.cs @@ -13,5 +13,10 @@ namespace NKC_WF.site { cmp_kitReqRunning.doUpdate(); } + protected void timerLoad_Tick(object sender, EventArgs e) + { + cmp_kitReqRunning.doUpdate(); + cmp_kitReqSched.doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/site/KitRequestSched.aspx.designer.cs b/NKC_WF/site/KitRequestSched.aspx.designer.cs index 83de79d..7177d56 100644 --- a/NKC_WF/site/KitRequestSched.aspx.designer.cs +++ b/NKC_WF/site/KitRequestSched.aspx.designer.cs @@ -14,6 +14,24 @@ namespace NKC_WF.site public partial class KitRequestSched { + /// + /// 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 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 cmp_kitReqRunning. /// From 17a767b535bfbf7edcc60958d358277dcadb6e91 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 17:37:29 +0200 Subject: [PATCH 5/8] Fiox refresh machine LOAD --- NKC_WF/site/MachineLoad.aspx | 6 +---- NKC_WF/site/MachineLoad.aspx.cs | 1 + NKC_WF/site/MachineLoad.aspx.designer.cs | 27 +++++++------------ NKC_WF/site/MachineLoadSmart.aspx | 25 ++++++++--------- NKC_WF/site/MachineLoadSmart.aspx.cs | 11 ++++---- NKC_WF/site/MachineLoadSmart.aspx.designer.cs | 9 +++++++ 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/NKC_WF/site/MachineLoad.aspx b/NKC_WF/site/MachineLoad.aspx index c867a0c..8049e10 100644 --- a/NKC_WF/site/MachineLoad.aspx +++ b/NKC_WF/site/MachineLoad.aspx @@ -5,21 +5,17 @@
-

<%: traduci("MachineLoad") %>

+
- - - -
diff --git a/NKC_WF/site/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs index 80060be..a0e1a2e 100644 --- a/NKC_WF/site/MachineLoad.aspx.cs +++ b/NKC_WF/site/MachineLoad.aspx.cs @@ -21,6 +21,7 @@ namespace NKC_WF private void forceRefresh() { + cmp_stackLoading.doUpdate(); cmp_ML_ShDet.BatchId = cmp_stackLoading.BatchIdCurr; cmp_ML_ShDet1.BatchId = cmp_stackLoading.BatchIdCurr; cmp_ML_ShDet2.BatchId = cmp_stackLoading.BatchIdCurr; diff --git a/NKC_WF/site/MachineLoad.aspx.designer.cs b/NKC_WF/site/MachineLoad.aspx.designer.cs index 1a4afa6..be820d3 100644 --- a/NKC_WF/site/MachineLoad.aspx.designer.cs +++ b/NKC_WF/site/MachineLoad.aspx.designer.cs @@ -14,15 +14,6 @@ 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. /// @@ -32,6 +23,15 @@ namespace NKC_WF /// protected global::System.Web.UI.UpdatePanel upnlBCode; + /// + /// 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 cmp_stackLoading. /// @@ -41,15 +41,6 @@ namespace NKC_WF /// 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. /// diff --git a/NKC_WF/site/MachineLoadSmart.aspx b/NKC_WF/site/MachineLoadSmart.aspx index 3065dd5..f50d47c 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx +++ b/NKC_WF/site/MachineLoadSmart.aspx @@ -4,19 +4,20 @@
-
-

<%: traduci("MachineLoad") %>

-
- - -
-
- +
+

<%: traduci("MachineLoad") %>

+
+ + + +
+
+ +
-
- - + + +
-
diff --git a/NKC_WF/site/MachineLoadSmart.aspx.cs b/NKC_WF/site/MachineLoadSmart.aspx.cs index c293753..a60db68 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx.cs +++ b/NKC_WF/site/MachineLoadSmart.aspx.cs @@ -16,18 +16,17 @@ namespace NKC_WF.site ((SiteMaster)this.Master).showSearch = false; forceRefresh(); } - cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh; } - private void Cmp_stackLoading_eh_doRefresh(object sender, EventArgs e) - { - forceRefresh(); - } private void forceRefresh() { - + cmp_stackLoading.doUpdate(); } + protected void timerLoad_Tick(object sender, EventArgs e) + { + forceRefresh(); + } } } \ No newline at end of file diff --git a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs index 4493031..3727818 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs +++ b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs @@ -23,6 +23,15 @@ namespace NKC_WF.site /// protected global::System.Web.UI.UpdatePanel upnlBCode; + /// + /// 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 cmp_stackLoading. /// From 9cbc82d7ef2339b82d83884b2b05fd6bc4aa54c2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 17:37:43 +0200 Subject: [PATCH 6/8] FIX gestione KART SMART --- NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs | 5 ++ .../WebUserControls/cmp_kitImpCheck.ascx.cs | 2 +- .../WebUserControls/cmp_kitReqRunning.ascx.cs | 1 + .../WebUserControls/cmp_kitReqSched.ascx.cs | 7 ++ NKC_WF/WebUserControls/cmp_kittingCart.ascx | 6 +- .../WebUserControls/cmp_kittingSmart.ascx.cs | 68 ++++++++++++++++++- 6 files changed, 84 insertions(+), 5 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs b/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs index 6f2d971..23de14c 100644 --- a/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs @@ -32,5 +32,10 @@ namespace NKC_WF.WebUserControls grView.DataBind(); } } + + internal void doUpdate() + { + grView.DataBind(); + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs index 6409b12..f74a983 100644 --- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs @@ -158,7 +158,7 @@ namespace NKC_WF.WebUserControls protected void lbtDoAction_Click(object sender, EventArgs e) { // in base a cosa ho in memoria procedo con successivo step - if (checkOk && !imported) + if (!checkOk || !imported) { tryImport(false); } diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs index 25a124c..cf2441a 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs @@ -21,6 +21,7 @@ namespace NKC_WF.WebUserControls { grView.DataBind(); fixVisibility(); + cmp_KR_cart.doUpdate(); } protected void grView_SelectedIndexChanged(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs index 5c9e148..ca8e05e 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs @@ -30,6 +30,13 @@ namespace NKC_WF.WebUserControls } } + internal void doUpdate() + { + grView.SelectedIndex = -1; + grView.DataBind(); + lblTitle.Focus(); + } + private void fixSchedOrd() { numRows = DataLayer.man.taPL.getToSchedule().Count * 10; diff --git a/NKC_WF/WebUserControls/cmp_kittingCart.ascx b/NKC_WF/WebUserControls/cmp_kittingCart.ascx index fc48d8f..9729ad2 100644 --- a/NKC_WF/WebUserControls/cmp_kittingCart.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingCart.ascx @@ -45,15 +45,15 @@
-
+
Wait:
-
+
Ready:
-
+
Cart:
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 93f4992..f201b6d 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -200,7 +200,7 @@ namespace NKC_WF.WebUserControls break; case codeType.Item: cmp_barcode.showOutput("badge badge-success", $"Valid IT Code: {decoData.rawData}"); - //processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.ItemGeneric: cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}"); @@ -441,6 +441,72 @@ namespace NKC_WF.WebUserControls } } break; + case codeType.Item: + // recupero la tab ITEMS x iniziare a controllare i dati... + tabItem = DataLayer.man.taIL.getBySearch(codeInt, rawData, 0, 999); + if (tabItem.Count == 0) + { + displError($"PART: Code not found {rawData}, please retry", true); + showItemDetail(false, null, true); + } + else if (tabItem.Count == 1) + { + showItemDetail(true, tabItem[0], false); + // verifico se ITEM sia o meno stato caricato sul CART x delivery finale + + // se caricato --> mostro che è già a posto + + // se non caricato --> controllo SecOp + + + // se non caricato --> controllo PAINT + + // gestione doppia lettura x conferma OnCart + + // salvataggio di OnCartDate + + } + + + + +#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... var tabOKOI = DataLayer.man.taOKOI.getByOtherItemDtmx(rawData); From 361fc7424179e7cc8567ffb0bfd5598dec342203 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 18:27:56 +0200 Subject: [PATCH 7/8] 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. /// From efd86dfdf71cf29e9a6652fbd202875ca8aeb33e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 10 Aug 2020 18:37:28 +0200 Subject: [PATCH 8/8] Fix orderType a num (no string) --- NKC_SDK/Objects.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NKC_SDK/Objects.cs b/NKC_SDK/Objects.cs index 5322da8..8fe8af4 100644 --- a/NKC_SDK/Objects.cs +++ b/NKC_SDK/Objects.cs @@ -54,7 +54,8 @@ namespace NKC_SDK /// /// Tipo di ordine richiesto /// - [JsonConverter(typeof(StringEnumConverter))] + // riportato a numero + //[JsonConverter(typeof(StringEnumConverter))] public oType OrderType { get; set; } /// /// Elenco ordini richeisti da processare / nestare