From 0e9d0acfcba567846fe7ee21c34667a382b748ed Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 13 Oct 2020 11:14:12 +0200 Subject: [PATCH 01/47] Fix Warmers behaviour --- Thermo.Active/wwwroot/src/services/hub.ts | 6 ++++++ Thermo.Active/wwwroot/src/store/warmers.store.ts | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Thermo.Active/wwwroot/src/services/hub.ts b/Thermo.Active/wwwroot/src/services/hub.ts index 6e3a0b07..b313ce85 100644 --- a/Thermo.Active/wwwroot/src/services/hub.ts +++ b/Thermo.Active/wwwroot/src/services/hub.ts @@ -26,6 +26,7 @@ import { prodActions } from "@/store/prod.store"; import { Model } from "vue-property-decorator"; import { prodService } from "./prodService"; import { recipeService } from "./recipeService"; +import { warmersActions } from "@/store/warmers.store"; declare const PRODUCTION; @@ -107,6 +108,7 @@ export class Hub { // qui i NUOVI metodi NUOVI dal server (Recipe, gauges) da completare lato HUB this._hub.client.recipeFullData = Hub.recipeFullData; + this._hub.client.warmersData = Hub.warmersData; this._hub.client.setpointHmiInvalid = Hub.setpointHmiInvalid; this._hub.client.recipeOverData = Hub.recipeOverData; this._hub.client.recipeChangedData = Hub.recipeChangedData; @@ -181,6 +183,10 @@ export class Hub { recipeActions.setCurrent(store, data, true); } + public static warmersData(data){ + warmersActions.setChannels(store, data as { [id: number]: Warmers.IChannel }); + } + public static async setpointHmiInvalid(data) { if (data) { await recipeService.GetCurrent(); diff --git a/Thermo.Active/wwwroot/src/store/warmers.store.ts b/Thermo.Active/wwwroot/src/store/warmers.store.ts index 9b564425..1f155e75 100644 --- a/Thermo.Active/wwwroot/src/store/warmers.store.ts +++ b/Thermo.Active/wwwroot/src/store/warmers.store.ts @@ -38,8 +38,14 @@ export const warmersStore = { SetChannels(state, model: { [id: number]: Warmers.IChannel }) { for (const key in model) { if (model.hasOwnProperty(key)) { + let intModel = state.channels.find(obj => obj.idChannel == key) const element = model[key]; - state.channels.push(element); + if(!intModel){ + state.channels.push(element); + } + else{ + intModel.setpointHMI = element.setpointHMI; + } } } }, From 523300e5e1de09e3281842ee0a0db124c2fcc9c0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 13 Oct 2020 14:43:55 +0200 Subject: [PATCH 02/47] refresh periodo lettura --- Thermo.Active.Config/Config/serverConfig.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active.Config/Config/serverConfig.xml b/Thermo.Active.Config/Config/serverConfig.xml index d6bf3538..2685ab69 100644 --- a/Thermo.Active.Config/Config/serverConfig.xml +++ b/Thermo.Active.Config/Config/serverConfig.xml @@ -124,7 +124,7 @@ - + \ No newline at end of file From 075a7e2e8d9ee49c594795ae4b8383f03e8a30dc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 13 Oct 2020 14:45:00 +0200 Subject: [PATCH 03/47] new rel 115 --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index f34aed71..aa5723a5 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.100.114")] \ No newline at end of file +[assembly: AssemblyVersion("0.100.115")] \ No newline at end of file From 57e96b9eb91865b14baeda79749cf685b09fbeef Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 13 Oct 2020 16:10:27 +0200 Subject: [PATCH 04/47] update x refresh prodPanel --- Thermo.Active.Config/Config/serverConfig.xml | 2 +- Thermo.Active.Model/DTOModels/ThProd/DTOThermoPanelProd.cs | 3 +++ Thermo.Active.NC/NcAdapter.cs | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Thermo.Active.Config/Config/serverConfig.xml b/Thermo.Active.Config/Config/serverConfig.xml index 2685ab69..107ab624 100644 --- a/Thermo.Active.Config/Config/serverConfig.xml +++ b/Thermo.Active.Config/Config/serverConfig.xml @@ -118,7 +118,7 @@ - + diff --git a/Thermo.Active.Model/DTOModels/ThProd/DTOThermoPanelProd.cs b/Thermo.Active.Model/DTOModels/ThProd/DTOThermoPanelProd.cs index 2a3d8dd2..840e2579 100644 --- a/Thermo.Active.Model/DTOModels/ThProd/DTOThermoPanelProd.cs +++ b/Thermo.Active.Model/DTOModels/ThProd/DTOThermoPanelProd.cs @@ -9,6 +9,7 @@ namespace Thermo.Active.Model.DTOModels.ThProd { public short NumTarget { get; set; } = 0; public short NumDone { get; set; } = 0; + public short NumPreHot { get; set; } = 0; public DateTime InizioProd { get; set; } = DateTime.Now; public double StimaDurata { get; set; } = 0; public double TempAct { get; set; } = 0; @@ -28,6 +29,8 @@ namespace Thermo.Active.Model.DTOModels.ThProd return false; if (NumDone != item.NumDone) return false; + if (NumPreHot != item.NumPreHot) + return false; if (InizioProd != item.InizioProd) return false; if (Math.Round(Math.Abs(StimaDurata - item.StimaDurata), 1) >= Constants.EPSILON) diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index da2c743f..4e9c4a09 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1553,6 +1553,7 @@ namespace Thermo.Active.NC { currentProdPanel.NumDone = lastProdInfoData.NumDone; currentProdPanel.NumTarget = lastProdInfoData.NumTarget; + currentProdPanel.NumPreHot = lastProdInfoData.NumPreHot; currentProdPanel.LastTCiclo = Math.Round((double)lastProdInfoData.TimeCycleGross / 1000, 2); if (lastProdInfoData.TimeCycleGross > 0) { @@ -1688,8 +1689,6 @@ namespace Thermo.Active.NC // 2020.09.02: incremento di 1 il NUMERO dei pezzi, in modo che mostro il pezzo corrente (n=fatti + 1) prodInfoData.NumDone++; - //// popolo il valore LAST se ho una delle condizioni missing, num fatti = 0, riscaldi > 0 - //if (lastProdInfoData == null || (lastProdInfoData.NumDone == 0) || prodInfoData.NumDone == 0 || prodInfoData.NumPreHot > 0) // se nullo lo popolo if (lastProdInfoData == null) { From 5d3d1f45f8bf4996bdc075f521e8bccc28e80efc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 13 Oct 2020 16:10:37 +0200 Subject: [PATCH 05/47] new rel 116 --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index aa5723a5..217dbf22 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.100.115")] \ No newline at end of file +[assembly: AssemblyVersion("0.100.116")] \ No newline at end of file From df0c74540f8b461cf0e86c678b1de44f97be550d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 13 Oct 2020 16:27:05 +0200 Subject: [PATCH 06/47] check modifica num riscaldi + cambio ordine check x save prod --- Thermo.Active.NC/NcAdapter.cs | 39 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index 4e9c4a09..41c1e383 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1543,7 +1543,8 @@ namespace Thermo.Active.NC } bool changeNumPz = LastProdPanelData.NumDone != lastProdInfoData.NumDone; bool changeNumTarget = lastProdInfoData.NumTarget != LastProdPanelData.NumTarget; - dataChanged = changeNumPz || changeSetpoint || changeNumTarget; + bool changeNumPreHot = lastProdInfoData.NumPreHot != LastProdPanelData.NumPreHot; + dataChanged = changeNumPz || changeSetpoint || changeNumTarget || changeNumPreHot; } } if (dataChanged) @@ -1695,31 +1696,31 @@ namespace Thermo.Active.NC lastProdInfoData = prodInfoRawData; } - // se ho update da strobe... sennò restituisco ultima lettura... - if (ThermoProdUpdatedStr) + // do comparison with old record and if changed --> persist on DB! + if (!prodInfoRawData.Equals(lastProdInfoData)) { - // do comparison with old record and if changed --> persist on DB! - if (!prodInfoRawData.Equals(lastProdInfoData)) - { - // save on DB! attenzione: RAW DATA perché salvo pezzo PRECEDENTE... - using (ProdInfoController prodInfoController = new ProdInfoController()) - { - prodInfoController.Create(prodInfoRawData.NumTarget, prodInfoRawData.NumDone, prodInfoRawData.TimeWarm, prodInfoRawData.TimeVent, prodInfoRawData.TimeVacuum, prodInfoRawData.TimeCycleGross, prodInfoRawData.TimeCycleNet, prodInfoRawData.MaterialTempEndWarm, prodInfoRawData.MaterialTempEndVent, prodInfoRawData.MoldTemp, prodInfoRawData.VacuumReadVal, prodInfoRawData.MouldEnergyOUT, prodInfoRawData.MouldEnergyIN, false); - } - // update last info data - lastProdInfoData = prodInfoRawData; - - // manage strobe/ack! - libraryError = numericalControl.PLC_WAckProdUpdate(); - if (libraryError.IsError()) - return libraryError; - } + // update last info data + lastProdInfoData = prodInfoRawData; } else { prodInfoRawData = lastProdInfoData; } + // se ho update da strobe... sennò restituisco ultima lettura... + if (ThermoProdUpdatedStr) + { + // save on DB! attenzione: RAW DATA perché salvo pezzo PRECEDENTE... + using (ProdInfoController prodInfoController = new ProdInfoController()) + { + prodInfoController.Create(prodInfoRawData.NumTarget, prodInfoRawData.NumDone, prodInfoRawData.TimeWarm, prodInfoRawData.TimeVent, prodInfoRawData.TimeVacuum, prodInfoRawData.TimeCycleGross, prodInfoRawData.TimeCycleNet, prodInfoRawData.MaterialTempEndWarm, prodInfoRawData.MaterialTempEndVent, prodInfoRawData.MoldTemp, prodInfoRawData.VacuumReadVal, prodInfoRawData.MouldEnergyOUT, prodInfoRawData.MouldEnergyIN, false); + } + // manage strobe/ack! + libraryError = numericalControl.PLC_WAckProdUpdate(); + if (libraryError.IsError()) + return libraryError; + } + // ora controllo inizio/fine produzione if (ThermoProdStartStr) { From c2cd9adef80e365c75f129bec62829222e6d8ec7 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 13 Oct 2020 18:10:57 +0200 Subject: [PATCH 07/47] Fix Dashboards UI --- Thermo.Active/wwwroot/src/@types/prod.cs.d.ts | 2 +- .../app_modules_thermo/dashboard/base-components/gauge.ts | 2 +- .../app_modules_thermo/dashboard/base-components/gauge.vue | 6 +++--- .../app_modules_thermo/dashboard/base-components/item.ts | 7 +++++++ .../app_modules_thermo/dashboard/base-components/item.vue | 3 ++- .../wwwroot/src/app_modules_thermo/dashboard/dashboard.ts | 5 ++--- .../wwwroot/src/app_modules_thermo/dashboard/dashboard.vue | 2 +- .../src/app_modules_thermo/processo/components/processo.ts | 4 ++-- .../setup/avvio-produzione/avvio-produzione.ts | 2 +- Thermo.Active/wwwroot/src/store/prod.store.ts | 1 + 10 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts index f9a7b79b..a89fae0f 100644 --- a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts +++ b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts @@ -3,7 +3,6 @@ declare module Prod { interface IProd { numTarget: number; numDone: number; - numPreHot: number; timeWarm: number; timeVent: number; timeVacuum: number; @@ -20,6 +19,7 @@ declare module Prod { interface IProdPanel { numTarget: number; numDone: number; + numPreHot: number; inizioProd: string; stimaDurata: number; tempAct: number; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts index 8999b1f4..7d6b66b8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts @@ -48,7 +48,7 @@ export default class MainGauge extends Vue { }; } - get prod() { return store.state.prod.prod } + get prod() { return store.state.prod.panel } polarToCartesian(centerX, centerY, radius, angleInDegrees) { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue index acc397ae..cc8d7f34 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue @@ -5,7 +5,7 @@
- + {{prod.numDone}} -{{scrapedItems.length}} - -{{prod.numPreHot}} + -{{prod.numPreHot}}
{{prod.numTarget}} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts index bf2df8ac..6e246259 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts @@ -9,6 +9,13 @@ export default class Item extends Vue { @Prop() value: Prod.IProd; + @Prop() + panel: Prod.IProdPanel + + get noDisplayNumber(){ + return this.panel && this.value.numDone > this.panel.numTarget; + } + showDetails: boolean = false; async setScrap(num: number) { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue index be6ae58c..4f259388 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue @@ -1,7 +1,8 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts index 52bbe2cd..0aa4ae74 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts @@ -13,10 +13,15 @@ export default class Item extends Vue { panel: Prod.IProdPanel get noDisplayNumber(){ - return this.panel && this.value.numDone > this.panel.numTarget; + return this.panel && this.panel.numTarget != 0 && this.value.numDone > this.panel.numTarget; } showDetails: boolean = false; + openCloseDetails(){ + this.showDetails = !this.showDetails; + //if(this.showDetails) + // this.$emit("close-detail",this.value.numDone); + } async setScrap(num: number) { this.value.isScrap = !this.value.isScrap; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue index 4f259388..51047367 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue @@ -1,6 +1,6 @@
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/edit-produzione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/edit-produzione.ts new file mode 100644 index 00000000..faec15e1 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/edit-produzione.ts @@ -0,0 +1,68 @@ +import Vue from "vue"; +import { Modal, ModalHelper } from "@/components/modals"; +import { Factory, messageService, awaiter } from "@/_base"; +import Component from "vue-class-component"; +import { Prop,Watch } from 'vue-property-decorator'; +import { appModelActions, store } from "@/store/app.store"; +import { prodService } from "@/services/prodService"; +import { prodActions } from "@/store/prod.store"; + +@Component({ + components: { + modal: Modal, + } +}) +export default class EditProduzione extends Vue { + + pieces: Recipe.IValue = { + setpointHMI: 0, + range: { min: 0, max: 999999 }, + status: { + enabled: true, + hasError: false, + visible: true + } + } as Recipe.IValue; + + @Watch("pieces.status.enabled") + changeMaxPieces(){ + if(!this.pieces.status.enabled) + { + this.pieces.setpointHMI = 0; + } + } + annulla() { + ModalHelper.HideModal(); + }; + + get prod() { return store.state.prod.panel } + + async showDashboard() { + + await prodService.Start(this.pieces.setpointHMI, false, 0); + + + ModalHelper.HideModal(); + } + + async beforeMount() { + // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); + messageService.subscribeToChannel("esc_pressed", args => { + this.close(); + }); + } + + beforeDestroy() { + messageService.deleteChannel("esc_pressed"); + } + + close() { + messageService.deleteChannel("esc_pressed"); + ModalHelper.HideModal(); + } + + mounted() { + this.pieces.setpointHMI = this.prod.numTarget; + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/edit-produzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/edit-produzione.vue new file mode 100644 index 00000000..bdefdf83 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/edit-produzione.vue @@ -0,0 +1,40 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/controlBox.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/controlBox.ts index b9a3577d..60f05fb3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/controlBox.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/controlBox.ts @@ -46,6 +46,7 @@ export default class ControlBox extends Vue { ontouchmove(event: TouchEvent) { if (!this.touching) return; + if(!this.value.status.enabled) return; let newtouch: { x: number, y: number } = null; for (const touch of Array.from(event.touches).slice(0, 1)) { @@ -58,6 +59,7 @@ export default class ControlBox extends Vue { if (this.moveVertical) this.value.setpointHMI -= (newtouch.y - this.touching.y) * this.scale; + this.value.setpointHMI = parseFloat(this.value.setpointHMI.toFixed(this.value.numDec)); this.value.setpointHMI = Math.min(Math.max(this.value.setpointHMI, this.value.range.min), this.value.range.max); // console.log(event, newtouch, this.touching); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue index 86baf461..225eb145 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue @@ -25,30 +25,6 @@ {{recipe.positions_frame_lower_speed.unitMeasure}}
-
-
- - 00 - mm -
-
- - 00 - mm -
-
-
-
- - 00 - mm -
-
- - 00 - mm -
-
From dee9084d62cb49e3b8acf8f0b7d4a09303c34cef Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 15 Oct 2020 12:56:08 +0200 Subject: [PATCH 21/47] fix Process-start window --- Thermo.Active.Utils/languages/IT.xml | 11 ++++++++++- Thermo.Active.Utils/languages/en.xml | 11 ++++++++++- .../wwwroot/assets/styles/base/processo.less | 4 ++++ Thermo.Active/wwwroot/assets/styles/style.css | 3 +++ .../processo/components/processo.ts | 5 +++++ .../processo/components/processo.vue | 8 +++++--- .../setup/avvio-produzione/avvio-produzione.vue | 6 +++--- 7 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Thermo.Active.Utils/languages/IT.xml b/Thermo.Active.Utils/languages/IT.xml index 5f072a11..ff82f289 100644 --- a/Thermo.Active.Utils/languages/IT.xml +++ b/Thermo.Active.Utils/languages/IT.xml @@ -1,5 +1,5 @@ - + Italiano Effettuare manutenzione @@ -314,4 +314,13 @@ Conferma Annulla Area di carico + Avvio produione + Nuovo lotto produttivo + Cicli di warmup + Numero di cicli: + Avvio + Modifica produione + Lotto di produzione + Setta numeto max di pezzi + Numero di pezzi: \ No newline at end of file diff --git a/Thermo.Active.Utils/languages/en.xml b/Thermo.Active.Utils/languages/en.xml index e74ea093..72664d05 100644 --- a/Thermo.Active.Utils/languages/en.xml +++ b/Thermo.Active.Utils/languages/en.xml @@ -1,5 +1,5 @@ - + English Maintenance request @@ -314,4 +314,13 @@ Confirm Cancel Loading area + Start Production + New production lot + Warmup cycles + Number of cycles: + Start + Edit Production + Production lot + Set the max num of pieces + Number of pieces: \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/processo.less b/Thermo.Active/wwwroot/assets/styles/base/processo.less index b8602646..426a9391 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/processo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/processo.less @@ -27,6 +27,10 @@ justify-content: flex-end; grid-column-gap: 10px; + .totp{ + margin-right: 10px; + } + button { border: none; border-radius: 2px; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 510a501c..2090ac32 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -5223,6 +5223,9 @@ article .box .body { justify-content: flex-end; grid-column-gap: 10px; } +.modal.processo-info header .tab-header .totp { + margin-right: 10px; +} .modal.processo-info header .tab-header button { border: none; border-radius: 2px; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts index ecd1c671..0093c323 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts @@ -18,6 +18,11 @@ import EditProduzione from "@/app_modules_thermo/setup/avvio-produzione/edit-pro }) export default class Processo extends Vue { + + + get inAuto(): boolean { + return store.state.machineStatus.cycleProd.mode==2; + }; get actual(): number { return store.state.prod.panel.numDone; }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue index 97a6b562..d47f5690 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue @@ -20,10 +20,12 @@ @checkChanged="softKeyChanged(b.id, b.operatorConfirmationNeeded)" > -
- +
@@ -45,8 +45,8 @@
- - + +
From 7c2db0170c3cdfee0e2e9ac84528f8108c714327 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 15 Oct 2020 13:14:11 +0200 Subject: [PATCH 22/47] update vers numb --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 1cae8926..4d50cfa1 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.101.120")] \ No newline at end of file +[assembly: AssemblyVersion("0.101.122")] \ No newline at end of file From bd4cb3504a47bb49bf3706257c7756256f237fcd Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 15 Oct 2020 15:47:22 +0200 Subject: [PATCH 23/47] FIx load recipe --- .../src/app_modules_thermo/processo/components/processo.vue | 4 ++-- .../wwwroot/src/modules/base-components/modal-load-program.ts | 4 +++- .../src/modules/base-components/modal-load-program.vue | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue index d47f5690..8259a047 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue @@ -24,8 +24,8 @@
{{actual}}/
-
{{tot}}
-
--
+
{{tot}}
+
--
From 5f1ca0699af3d7835d414ef1e5c7551025213fcc Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 16 Oct 2020 11:05:23 +0200 Subject: [PATCH 24/47] Fixes --- Client/Program.cs | 1 + .../src/app_modules_thermo/processo/components/processo.ts | 3 +++ .../src/app_modules_thermo/processo/components/processo.vue | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Client/Program.cs b/Client/Program.cs index 3c28d99f..902eeb1b 100644 --- a/Client/Program.cs +++ b/Client/Program.cs @@ -172,6 +172,7 @@ namespace Active_Client e.CommandLine.AppendSwitch("--enable-usermedia-screen-capture"); e.CommandLine.AppendSwitch("--no-proxy-server"); e.CommandLine.AppendSwitch("--ignore-certificate-errors-spki-list"); + e.CommandLine.AppendSwitch("--ignore-certificate-errors"); e.CommandLine.AppendSwitch("--ignore-ssl-errors"); } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts index 0093c323..dfc55176 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts @@ -30,6 +30,9 @@ export default class Processo extends Vue { get tot(): number { return store.state.prod.panel.numTarget; }; + get preHot(): number { + return store.state.prod.panel.numPreHot; + }; get blocks(): server.Modblock[] { return store.state.modules.blocks; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue index 8259a047..457e0793 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue @@ -21,7 +21,8 @@ >