From d970b704a9d34c09c7aa353376dd0f6ff0f1c4a0 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 18 Nov 2020 10:12:29 +0100 Subject: [PATCH 1/4] Update gestione segnaposto x conf prod --- MP-IO/MP-IO.csproj.user | 2 +- MP-MON/Controllers/DbTaskController.cs | 11 +++++++++-- MP-MON/MP-MON.csproj.user | 2 +- MP-Site/MP-Site.csproj.user | 2 +- MP-TAB/WebUserControls/mod_confProd.ascx | 5 +++-- MP-TAB/WebUserControls/mod_confProd.ascx.cs | 6 ++++-- MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs | 9 +++++++++ 7 files changed, 28 insertions(+), 9 deletions(-) diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 8f155350..486e078c 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - Debug|Any CPU + IIS02|Any CPU ApiControllerWithActionsScaffolder root/Controller 600 diff --git a/MP-MON/Controllers/DbTaskController.cs b/MP-MON/Controllers/DbTaskController.cs index f22f0153..cfc8fc53 100644 --- a/MP-MON/Controllers/DbTaskController.cs +++ b/MP-MON/Controllers/DbTaskController.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; +using System.Text; using System.Web.Http; namespace MP_MON.Controllers @@ -19,7 +20,7 @@ namespace MP_MON.Controllers // GET: api/DbTask public IEnumerable Get() { - return new string[] { "value1", "value2" }; + return new string[] { "Refresh", "value2" }; } // GET: api/DbTask/5 @@ -29,8 +30,14 @@ namespace MP_MON.Controllers } // POST: api/DbTask - public void Post([FromBody] string value) + public string Post([FromBody] List names) { + string answ = ""; + foreach (var item in names) + { + answ += $"{item} | "; + } + return answ; } // PUT: api/DbTask/5 diff --git a/MP-MON/MP-MON.csproj.user b/MP-MON/MP-MON.csproj.user index 8765882c..cd6479fa 100644 --- a/MP-MON/MP-MON.csproj.user +++ b/MP-MON/MP-MON.csproj.user @@ -19,7 +19,7 @@ - Debug|Any CPU + IIS02|Any CPU ApiControllerWithActionsScaffolder root/Controller diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index c2cb7f33..1622a331 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + IIS02|Any CPU ShowAllFiles IIS02 diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx b/MP-TAB/WebUserControls/mod_confProd.ascx index 351ad743..dedac502 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx +++ b/MP-TAB/WebUserControls/mod_confProd.ascx @@ -12,9 +12,9 @@ ////document.getElementById('<%= lblUpdating.ClientID %>').hidden = true; } function fixDelayed() { - console.log('start delay'); + //console.log('start delay'); setTimeout(function () { - console.log('after'); + //console.log('after'); ////document.getElementById('<%= lblUpdating.ClientID %>').hidden = true; }, 300); } @@ -71,6 +71,7 @@
+  
CONFERMA diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.cs index 020aaac0..4e83f6b9 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.cs @@ -248,8 +248,10 @@ namespace MoonProTablet.WebUserControls private void checkConfig() { // verifico SE sia permesso gestire i "Pezzi lasciati" in macchina... - lblNumLasciati.Visible = memLayer.ML.cdvb("enablePzProdLasciati"); - txtNumLasciati.Visible = memLayer.ML.cdvb("enablePzProdLasciati"); + bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati"); + lblNumLasciati.Visible = enablePzProdLasciati; + txtNumLasciati.Visible = enablePzProdLasciati; + lblEmptyNumLasciati.Visible = !enablePzProdLasciati; } /// diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs index 8d089051..34ee2179 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs @@ -167,6 +167,15 @@ namespace MoonProTablet.WebUserControls /// protected global::System.Web.UI.WebControls.TextBox txtNumLasciati; + /// + /// Controllo lblEmptyNumLasciati. + /// + /// + /// 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 lblEmptyNumLasciati; + /// /// Controllo lbtSalva. /// From f73553a2a21fc340d1b8d86f0b521869742fbe76 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 18 Nov 2020 14:45:55 +0100 Subject: [PATCH 2/4] Update invio dati arti/commessa/pezzi verso PLC da setup ODL --- MP-TAB/WebUserControls/mod_ODL.ascx.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index 40cfd395..c1592702 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -1068,6 +1068,17 @@ namespace MoonProTablet.WebUserControls // indico INIZIO SETUP su REDIS come EXE della macchina... string ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now); DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.startSetup, $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODL_curr}"); + // aggiungo articolo, commessa, richiesta pezzi... + try + { + var datiODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0]; + DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setArt, $"{datiODL.CodArticolo}"); + DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setPzComm, $"{datiODL.NumPezzi}"); + DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setComm, $"ODL{datiODL.IdxODL:00000000}"); + } + catch + { } + // se รจ multi CHIUDO ODL x altra tavola... if (isMulti) { From ebda7a22820376353a668072ef4e12c1411d4b53 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 18 Nov 2020 14:46:01 +0100 Subject: [PATCH 3/4] refresh + vers num --- MP-IO/MP-IO.csproj.user | 2 +- MP-MON/MP-MON.csproj.user | 2 +- MP-Site/MP-Site.csproj.user | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 486e078c..8f155350 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - IIS02|Any CPU + Debug|Any CPU ApiControllerWithActionsScaffolder root/Controller 600 diff --git a/MP-MON/MP-MON.csproj.user b/MP-MON/MP-MON.csproj.user index cd6479fa..8765882c 100644 --- a/MP-MON/MP-MON.csproj.user +++ b/MP-MON/MP-MON.csproj.user @@ -19,7 +19,7 @@ - IIS02|Any CPU + Debug|Any CPU ApiControllerWithActionsScaffolder root/Controller diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index 1622a331..c2cb7f33 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -8,7 +8,7 @@ - IIS02|Any CPU + Debug|Any CPU ShowAllFiles IIS02 From 9854fc2f2beeb2276516f38fc78b52766e30e8ac Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 18 Nov 2020 14:46:13 +0100 Subject: [PATCH 4/4] 1326 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc24bb25..15ce5eb0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1325']) { + withEnv(['NEXT_BUILD_NUMBER=1326']) { // env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO'