From 56a7e02c501da57d69c193447aafd8bd877ea5fe Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 17 Jan 2023 12:11:13 +0100 Subject: [PATCH] Start produzione: - machcine slave ricevono start produzione (es valvital) --- .../WebUserControls/mod_datiConfermati.ascx | 56 +++++++++---------- .../mod_datiConfermati.ascx.designer.cs | 56 ++++++++++--------- MP-TAB/WebUserControls/mod_ODL.ascx.cs | 1 + 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/MP-Site/WebUserControls/mod_datiConfermati.ascx b/MP-Site/WebUserControls/mod_datiConfermati.ascx index 63cbbae7..c0a06703 100644 --- a/MP-Site/WebUserControls/mod_datiConfermati.ascx +++ b/MP-Site/WebUserControls/mod_datiConfermati.ascx @@ -1,32 +1,32 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_datiConfermati.ascx.cs" - Inherits="MP_SITE.WebUserControls.mod_datiConfermati" %> + Inherits="MP_SITE.WebUserControls.mod_datiConfermati" %>
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
-Excel Dati Confermati - solo macchina corrente +Excel Dati Confermati - solo macchina corrente  -   - Excel Dati Confermati - tutte le macchine \ No newline at end of file +Excel Dati Confermati - tutte le macchine \ No newline at end of file diff --git a/MP-Site/WebUserControls/mod_datiConfermati.ascx.designer.cs b/MP-Site/WebUserControls/mod_datiConfermati.ascx.designer.cs index 09eecbdf..5a7f3001 100644 --- a/MP-Site/WebUserControls/mod_datiConfermati.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_datiConfermati.ascx.designer.cs @@ -1,51 +1,53 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace MP_SITE.WebUserControls { - - - public partial class mod_datiConfermati { - +namespace MP_SITE.WebUserControls +{ + + + public partial class mod_datiConfermati + { + /// - /// Controllo grView. + /// grView control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView grView; - + /// - /// Controllo ods. + /// ods control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; - + /// - /// Controllo HyperLink1. + /// hlMaccCurr control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink1; - + protected global::System.Web.UI.WebControls.HyperLink hlMaccCurr; + /// - /// Controllo HyperLink3. + /// hlMaccAll control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink3; + protected global::System.Web.UI.WebControls.HyperLink hlMaccAll; } } diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index da976aeb..6ea63e35 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -1364,6 +1364,7 @@ namespace MoonProTablet.WebUserControls // invio chiusura attrezzaggio ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now); string outData = $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODLStart}"; + processaEvento(machine.IdxMacchinaSlave, idxEvento, sb.ToString(), idxODLStart); DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.fixStopSetup, outData); }