From e7033cb2779a82448faf23b71a07e663b68cafd4 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Aug 2020 12:03:13 +0200 Subject: [PATCH 1/7] Fix deploy conf x web.config --- NKC_WF/Web.Debug-LELE.config | 2 +- NKC_WF/Web.Prod.config | 2 +- NKC_WF/Web.Release.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NKC_WF/Web.Debug-LELE.config b/NKC_WF/Web.Debug-LELE.config index e927903..e656677 100644 --- a/NKC_WF/Web.Debug-LELE.config +++ b/NKC_WF/Web.Debug-LELE.config @@ -16,7 +16,7 @@ - + diff --git a/NKC_WF/Web.Prod.config b/NKC_WF/Web.Prod.config index bb9d5b2..2e32522 100644 --- a/NKC_WF/Web.Prod.config +++ b/NKC_WF/Web.Prod.config @@ -22,7 +22,7 @@ - + diff --git a/NKC_WF/Web.Release.config b/NKC_WF/Web.Release.config index bb32033..bb642db 100644 --- a/NKC_WF/Web.Release.config +++ b/NKC_WF/Web.Release.config @@ -16,7 +16,7 @@ - + From 7140a6c65c3acb9234afec8f894dedb8d561149d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Aug 2020 12:03:35 +0200 Subject: [PATCH 2/7] new release --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 516ded9..5ad12db 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=345']) { + withEnv(['NEXT_BUILD_NUMBER=346']) { // 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}') From b4b6a777f6975eb806e352b569b26293c7ed8c0b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Aug 2020 12:22:39 +0200 Subject: [PATCH 3/7] Errore post scrap: deve reesettare tutto... --- NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index 1a846fb..6f06b0d 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -718,6 +718,8 @@ namespace NKC_WF.WebUserControls // rirprocesso barcode... lastCmd = lastValidCmd; processLastCmd(false); + resetSelection(true); + showItemDetail(false, null, false); } } } \ No newline at end of file From 614070b72904db1ca0a9b50400280fd7cc489caf Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Aug 2020 12:42:31 +0200 Subject: [PATCH 4/7] ancora fix gestione scrap --- NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index 6f06b0d..43f9796 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -714,12 +714,13 @@ namespace NKC_WF.WebUserControls // resetto item selezionato... DataLayer.man.taIL.updateStatus(itemIdSelected, 990, PlaceId); lgInfo($"cmp_unloadSmart | SCRAP | Status --> 990 | itemIdSelected: {itemIdSelected} | PlaceId: {PlaceId}"); + resetSelection(false); + showItemDetail(false, null, false); lblMessage.Text = traduci("PartScrapped"); - // rirprocesso barcode... + // riprocesso barcode... lastCmd = lastValidCmd; processLastCmd(false); - resetSelection(true); - showItemDetail(false, null, false); + resetButtons(); } } } \ No newline at end of file From dfd8094d983e48e342df01579ffd60e2b2e7a02b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Aug 2020 13:06:41 +0200 Subject: [PATCH 5/7] =?UTF-8?q?fix=20gestione=20calcolo=20possibilit=C3=A0?= =?UTF-8?q?=20nesting=20x=20caching=20redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AppData/ComLib.cs | 37 +++++++++++++++++++ NKC_WF/WebUserControls/cmp_batchDetail.ascx | 6 +-- .../WebUserControls/cmp_batchDetail.ascx.cs | 15 +++----- .../WebUserControls/cmp_offOrderDetail.ascx | 4 +- .../cmp_offOrderDetail.ascx.cs | 17 +++------ 5 files changed, 53 insertions(+), 26 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 4492913..5cbd3ad 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -604,6 +604,43 @@ namespace AppData // restituisco ok return answ; } + public static string canStartNewKey + { + get + { + return $"{redOutPath}:CanStartNew"; + } + } + /// + /// verifica se sia avviabile un nuovo task nesting controllando cache Redis o tabelle batch/offlineOrders + /// + public static bool canStartNew + { + get + { + bool answ = false; + bool valido = false; + // cerco in redis + if (memLayer.ML.redKeyPresent(canStartNewKey)) + { + string rawData = memLayer.ML.getRSV(canStartNewKey); + valido = bool.TryParse(rawData, out answ); + } + if (!valido) + { + // in primis controllo SE ci siano task running, nel qual caso è false e basta... + int numEst = DataLayer.man.taBL.getByStatus((int)BatchStatus.EstimationRequested, "", 0).Count; + int numNest = DataLayer.man.taBL.getByStatus((int)BatchStatus.NestRequested, "", 0).Count; + // ora controllo anche offline orders... + int numOffOrd = DataLayer.man.taOffOL.getRunning().Count; + // ora la somma di tutti DEVE essere zero... + answ = ((numEst + numNest + numOffOrd) == 0); + // salvo in redis + memLayer.ML.setRSV(canStartNewKey, answ.ToString(), 2); + } + return answ; + } + } /// /// Verifica lo stato di una richiesta di esecuzione BATCH x stima/nesting diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx index 781aaf6..34dd767 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx @@ -6,12 +6,12 @@

<%: traduci ("BatchDetail") %>

- +
- <%: traduci("SendToEstim") %> + <%: traduci("SendToEstim") %> <%: traduci("StopEstim") %> - <%: traduci("SendToNest") %> + <%: traduci("SendToNest") %> <%: traduci("StopNest") %> <%: traduci("AcceptNest") %>
diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index 5025067..8585260 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -239,17 +239,12 @@ namespace NKC_WF.WebUserControls /// verifica possibilità avvio TASK x presenza task NON chiusi ///
/// - public bool canStartNew() + public bool canStartNew { - bool answ = false; - // in primis controllo SE ci siano task running, nel qual caso è false e basta... - int numEst = DataLayer.man.taBL.getByStatus((int)BatchStatus.EstimationRequested, "", 0).Count; - int numNest = DataLayer.man.taBL.getByStatus((int)BatchStatus.NestRequested, "", 0).Count; - // ora controllo anche offline orders... - int numOffOrd = DataLayer.man.taOffOL.getRunning().Count; - // ora la somma di tutti DEVE essere zero... - answ = ((numEst + numNest + numOffOrd) == 0); - return answ; + get + { + return ComLib.canStartNew; + } } /// /// Converte il codice stato in effettivo campo diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx index 1c77b0f..fb77e89 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx @@ -27,11 +27,11 @@
- <%: traduci ("MakeCncProg") %> + <%: traduci ("MakeCncProg") %> <%: traduci ("StopCncReq") %>
- + <%: traduci ("ItemDone") %>
diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs index 47d19ac..52ee356 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs @@ -83,7 +83,7 @@ namespace NKC_WF.WebUserControls DataLayer.man.taOffOL.updateStatus(OffOrdId, 0); } frmView.DataBind(); - raiseEvent(); + raiseEvent(); } protected void lbtPrintLabels_Click(object sender, EventArgs e) @@ -120,17 +120,12 @@ namespace NKC_WF.WebUserControls /// verifica possibilità avvio TASK x presenza task NON chiusi /// /// - public bool canStartNew() + public bool canStartNew { - bool answ = false; - // in primis controllo SE ci siano task running, nel qual caso è false e basta... - int numEst = DataLayer.man.taBL.getByStatus((int)BatchStatus.EstimationRequested, "", 0).Count; - int numNest = DataLayer.man.taBL.getByStatus((int)BatchStatus.NestRequested, "", 0).Count; - // ora controllo anche offline orders... - int numOffOrd = DataLayer.man.taOffOL.getRunning().Count; - // ora la somma di tutti DEVE essere zero... - answ = ((numEst + numNest + numOffOrd) == 0); - return answ; + get + { + return ComLib.canStartNew; + } } } From 61c8f640055ba2144844e6f3519c3155f31552b1 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Aug 2020 14:39:14 +0200 Subject: [PATCH 6/7] Add dettaglio cod ext x OtherITems --- .../WebUserControls/cmp_KS_OtherItemsCart.ascx.cs | 14 ++++++++++++++ NKC_WF/WebUserControls/cmp_KS_currOI.ascx | 11 +++++++++-- NKC_WF/WebUserControls/cmp_KS_currOI.ascx.cs | 11 +++++++++++ .../cmp_KS_currOI.ascx.designer.cs | 9 +++++++++ NKC_WF/WebUserControls/cmp_OtherItemsDetail.ascx | 1 + NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs | 15 ++++++++++++--- 6 files changed, 56 insertions(+), 5 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs index 291b606..1cfaa2d 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs @@ -147,6 +147,20 @@ namespace NKC_WF.WebUserControls cmp_KS_OkoiOI.Dtmx = value; } } + /// + /// Descrizione OtherItem selezionato + /// + public string OtherItemDesc + { + get + { + return cmp_KS_currOI.Description; + } + set + { + cmp_KS_currOI.Description = value; + } + } protected void lbtAddAll_Click(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_KS_currOI.ascx b/NKC_WF/WebUserControls/cmp_KS_currOI.ascx index 45474b4..c57d959 100644 --- a/NKC_WF/WebUserControls/cmp_KS_currOI.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_currOI.ascx @@ -1,6 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_currOI.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_currOI" %>
-
<%: traduci ("OtherParts") %>
+
<%: traduci ("OtherParts") %>
- +
+
+ +
+
+ +
+
diff --git a/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.cs index 330c9b8..979fecc 100644 --- a/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.cs @@ -38,5 +38,16 @@ namespace NKC_WF.WebUserControls lblDtmx.Text = value; } } + public string Description + { + get + { + return lblDesc.Text; + } + set + { + lblDesc.Text = value; + } + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.designer.cs index c56f301..03dc6da 100644 --- a/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_KS_currOI.ascx.designer.cs @@ -31,5 +31,14 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblDtmx; + + /// + /// Controllo lblDesc. + /// + /// + /// 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.Label lblDesc; } } diff --git a/NKC_WF/WebUserControls/cmp_OtherItemsDetail.ascx b/NKC_WF/WebUserControls/cmp_OtherItemsDetail.ascx index 8709285..b231181 100644 --- a/NKC_WF/WebUserControls/cmp_OtherItemsDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_OtherItemsDetail.ascx @@ -28,6 +28,7 @@
+
<%# Eval("OtherItemDtmx") %>
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 0461c08..c26719f 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -511,14 +511,21 @@ namespace NKC_WF.WebUserControls var listCartAvailable = tabOKOI.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList(); if (listCartAvailable.Count == 0) { - displError($"{traduci("ErrPartNoCartAvail")}: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}"); + displError($"{traduci("ErrPartNoCartAvail")}: {rawData} | PART {tabOKOI[0].OtherItemExtCode} {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}"); // reset preliminare resetOtherItem(); } else { + string descr = "-"; + try + { + descr = tabOKOI[0].OtherItemExtCode; + } + catch + { } // mostro OtherItem! - setOtherItem(rawData, codeInt); + setOtherItem(rawData, codeInt, descr); } } } @@ -549,10 +556,12 @@ namespace NKC_WF.WebUserControls /// /// /// - private void setOtherItem(string rawData, int codeInt) + /// + private void setOtherItem(string rawData, int codeInt, string Description) { cmp_KS_OtherItemsCart.OtherItemID = codeInt; cmp_KS_OtherItemsCart.OtherItemDtmx = rawData; + cmp_KS_OtherItemsCart.OtherItemDesc = Description; cmp_KS_OtherItemsCart.doUpdate(); fixVisibility(); } From 9fb47bf96f967527cc84f8f119f56037c2313e67 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Aug 2020 14:50:55 +0200 Subject: [PATCH 7/7] Aggiunta lettura dati ordine ext + riga x CART --- NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs | 14 ++++++++++++++ NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs | 14 ++++++++++++++ NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs | 14 ++++++++++++++ .../cmp_KS_OtherItemsCart.ascx.cs | 14 ++++++++++++++ NKC_WF/WebUserControls/cmp_KS_currCart.ascx | 11 +++++++++-- NKC_WF/WebUserControls/cmp_KS_currCart.ascx.cs | 11 +++++++++++ .../cmp_KS_currCart.ascx.designer.cs | 9 +++++++++ NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs | 16 ++++++++++++++-- 8 files changed, 99 insertions(+), 4 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs index 7d2be8f..0f6a053 100644 --- a/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_BinCart.ascx.cs @@ -122,6 +122,20 @@ namespace NKC_WF.WebUserControls } } /// + /// Descrizione Cart selezionato (ord ext code) + /// + public string CartDesc + { + get + { + return cmp_KS_currCart.Description; + } + set + { + cmp_KS_currCart.Description = value; + } + } + /// /// Bin selezionato /// public int BinID diff --git a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs index f1f4707..5843686 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs @@ -46,6 +46,20 @@ namespace NKC_WF.WebUserControls cmp_KS_OkoiCart.Dtmx = value; } } + /// + /// Descrizione Cart selezionato (ord ext code) + /// + public string CartDesc + { + get + { + return cmp_KS_currCart.Description; + } + set + { + cmp_KS_currCart.Description = value; + } + } public void doUpdate() { } diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs index df7c764..5cdf10d 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs @@ -39,6 +39,20 @@ namespace NKC_WF.WebUserControls cmp_KS_currCart.Dtmx = value; } } + /// + /// Descrizione Cart selezionato (ord ext code) + /// + public string CartDesc + { + get + { + return cmp_KS_currCart.Description; + } + set + { + cmp_KS_currCart.Description = value; + } + } public int ItemID { get diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs index 1cfaa2d..3b6d75c 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs @@ -119,6 +119,20 @@ namespace NKC_WF.WebUserControls } } /// + /// Descrizione Cart selezionato (ord ext code) + /// + public string CartDesc + { + get + { + return cmp_KS_currCart.Description; + } + set + { + cmp_KS_currCart.Description = value; + } + } + /// /// OtherItem selezionato /// public int OtherItemID diff --git a/NKC_WF/WebUserControls/cmp_KS_currCart.ascx b/NKC_WF/WebUserControls/cmp_KS_currCart.ascx index f91bb99..d7c4644 100644 --- a/NKC_WF/WebUserControls/cmp_KS_currCart.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_currCart.ascx @@ -1,7 +1,14 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_currCart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_currCart" %>
-
<%: traduci ("Cart") %>
+
<%: traduci ("Cart") %>
- +
+
+ +
+
+ +
+
diff --git a/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.cs index a43b8a8..12a525c 100644 --- a/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.cs @@ -38,5 +38,16 @@ namespace NKC_WF.WebUserControls lblDtmx.Text = value; } } + public string Description + { + get + { + return lblDesc.Text; + } + set + { + lblDesc.Text = value; + } + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.designer.cs index d0391f2..5d7de46 100644 --- a/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_KS_currCart.ascx.designer.cs @@ -31,5 +31,14 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblDtmx; + + /// + /// Controllo lblDesc. + /// + /// + /// 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.Label lblDesc; } } diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index c26719f..e1150ef 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -295,7 +295,14 @@ namespace NKC_WF.WebUserControls else { // mostro CART! - setCart(rawData, codeInt); + string descr = "-"; + try + { + descr = rigaOrd.OrderExtCode; + } + catch + { } + setCart(rawData, codeInt, descr); // verifico se il cart sia già stato messo in scarico (in quel caso dico già ok...) var tabLog = DataLayer.man.taPLog.getByCartId(codeInt); if (tabLog.Count > 0) @@ -583,19 +590,24 @@ namespace NKC_WF.WebUserControls /// /// /// - private void setCart(string rawData, int codeInt) + /// + private void setCart(string rawData, int codeInt, string Description) { cmp_KS_BinCart.CartID = codeInt; cmp_KS_BinCart.CartDtmx = rawData; + cmp_KS_BinCart.CartDesc = Description; cmp_KS_BinCart.doUpdate(); cmp_KS_OtherItemsCart.CartID = codeInt; cmp_KS_OtherItemsCart.CartDtmx = rawData; + cmp_KS_OtherItemsCart.CartDesc = Description; cmp_KS_OtherItemsCart.doUpdate(); cmp_KS_Cart.CartID = codeInt; cmp_KS_Cart.CartDtmx = rawData; + cmp_KS_Cart.CartDesc = Description; cmp_KS_Cart.doUpdate(); cmp_KS_Items.CartID = codeInt; cmp_KS_Items.CartDtmx = rawData; + cmp_KS_Items.CartDesc = Description; cmp_KS_Items.doUpdate(); fixVisibility(); }