diff --git a/Jenkinsfile b/Jenkinsfile
index 38b6d7eb..c76c21d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=703']) {
+ withEnv(['NEXT_BUILD_NUMBER=704']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-Tablet/Controlli.aspx.cs b/MP-Tablet/Controlli.aspx.cs
index c4e189f7..7b59c44b 100644
--- a/MP-Tablet/Controlli.aspx.cs
+++ b/MP-Tablet/Controlli.aspx.cs
@@ -11,7 +11,18 @@ namespace MoonProTablet
{
protected void Page_Load(object sender, EventArgs e)
{
+ mod_controlliProd.eh_newVal += Mod_controlliProd_eh_newVal;
+ mod_controlliProd.eh_reset += Mod_controlliProd_eh_reset;
+ }
+ private void Mod_controlliProd_eh_reset(object sender, EventArgs e)
+ {
+ mod_elencoControlli.doUpdate();
+ }
+
+ private void Mod_controlliProd_eh_newVal(object sender, EventArgs e)
+ {
+ mod_elencoControlli.doUpdate();
}
}
}
\ No newline at end of file
diff --git a/MP-Tablet/WebUserControls/mod_controlliProd.ascx.cs b/MP-Tablet/WebUserControls/mod_controlliProd.ascx.cs
index 9463e96e..28cc1852 100644
--- a/MP-Tablet/WebUserControls/mod_controlliProd.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_controlliProd.ascx.cs
@@ -11,10 +11,6 @@ namespace MoonProTablet.WebUserControls
{
public partial class mod_controlliProd : System.Web.UI.UserControl
{
- ///
- /// registrato nuovo valore
- ///
- public event EventHandler eh_inserting;
///
/// registrato nuovo valore
///
@@ -185,14 +181,24 @@ namespace MoonProTablet.WebUserControls
///
protected void lbtSalva_Click(object sender, EventArgs e)
{
- // salvo controllo KO !!!FARE!!!
+ // salvo controllo KO
DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, false, txtNoteContr.Text.Trim(), DateTime.Now);
// sollevo evento!
if (eh_newVal != null)
{
eh_newVal(this, new EventArgs());
}
+ resetControlli();
}
+
+ private void resetControlli()
+ {
+ txtNoteContr.Text = "";
+ // nascondo!
+ switchBtnConferma(false);
+ divNote.Visible = false;
+ }
+
protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
{
subMaccSel = ddlSubMacc.SelectedValue;
@@ -237,6 +243,7 @@ namespace MoonProTablet.WebUserControls
{
eh_newVal(this, new EventArgs());
}
+ resetControlli();
}
protected void lbtKO_Click(object sender, EventArgs e)
diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx
index 808a7ddd..228b4b7a 100644
--- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx
+++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx
@@ -1,69 +1,36 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoControlli.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_elencoControlli" %>
<%@ Register Src="~/WebUserControls/mod_selPeriodo.ascx" TagPrefix="uc1" TagName="mod_selPeriodo" %>
-
-<%----%>
-
-<%----%>
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs
index 4aebbb66..1749966a 100644
--- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs
@@ -12,14 +12,11 @@ namespace MoonProTablet.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
-#if false
- if (!Page.IsPostBack)
- {
- intervalloDate periodo = datario.mngr.ultimiMesi(DateTime.Now, 12);
- txtDataFrom.Text = periodo.inizio.ToShortDateString();
- txtDataTo.Text = periodo.fine.ToShortDateString();
- }
-#endif
+ }
+
+ public void doUpdate()
+ {
+ grView.DataBind();
}
}
}
\ No newline at end of file
diff --git a/SQL Utils/SqlUpdate_5.0.sql b/SQL Utils/SqlUpdate_5.0.sql
index 2f0e3e66..d6b17c76 100644
--- a/SQL Utils/SqlUpdate_5.0.sql
+++ b/SQL Utils/SqlUpdate_5.0.sql
@@ -12,3 +12,117 @@ UPDATE LinkMenuJQM
WHERE Testo = 'Fermate'
GO
+/* TAB Registro controlli */
+/****** Object: Table [dbo].[RegistroControlli] Script Date: 13/03/2018 18:30:04 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[RegistroControlli](
+ [IdxControllo] [int] IDENTITY(1,1) NOT NULL,
+ [DataOra] [datetime] NOT NULL,
+ [IdxMacchina] [nvarchar](50) NOT NULL,
+ [IdxODL] [int] NOT NULL,
+ [CodArticolo] [nvarchar](50) NOT NULL,
+ [MatrOpr] [int] NOT NULL,
+ [EsitoOK] [bit] NOT NULL,
+ [Note] [nvarchar](250) NOT NULL,
+ CONSTRAINT [PK_RegistroControlli] PRIMARY KEY CLUSTERED
+(
+ [IdxControllo] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+ALTER TABLE [dbo].[RegistroControlli] ADD CONSTRAINT [DF_RegistroControlli_CodArticolo] DEFAULT ('-') FOR [CodArticolo]
+GO
+
+ALTER TABLE [dbo].[RegistroControlli] ADD CONSTRAINT [DF_RegistroControlli_EsitoOK] DEFAULT ((0)) FOR [EsitoOK]
+GO
+
+ALTER TABLE [dbo].[RegistroControlli] ADD CONSTRAINT [DF_RegistroControlli_Note] DEFAULT ('') FOR [Note]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'matricola dell''approvatore del record' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RegistroControlli', @level2type=N'COLUMN',@level2name=N'MatrOpr'
+GO
+
+
+
+
+/*************************************
+* STORED PROCEDURE stp_RC_getByFilt
+*
+* modif.: Steamware
+* modif: 2018.03.12 recupero elenco controlli filtrato
+**************************************/
+CREATE PROCEDURE [dbo].[stp_RC_getByFilt]
+(
+ @IdxMacchina NVARCHAR(50) = 0,
+ @DataFrom DATETIME = NULL,
+ @DataTo DATETIME = NULL
+)
+AS
+BEGIN
+
+ SET NOCOUNT ON;
+ SET XACT_ABORT ON;
+
+ IF @DataFrom IS NULL SET @DataFrom = DATEADD(YEAR, -1,GETDATE())
+ IF @DataTo IS NULL SET @DataTo = GETDATE()
+
+ -- recupero da tab ODL il codice odl stesso e l'articolo data macchina e data/ora...
+ SELECT *
+ FROM v_RegistroControlli
+ WHERE IdxMacchina = CASE WHEN @IdxMacchina = 0 THEN IdxMacchina ELSE @IdxMacchina END
+ AND DataOra BETWEEN @DataFrom AND @DataTo
+ ORDER BY DataOra DESC
+
+END
+GO
+
+/*************************************
+* STORED PROCEDURE stp_RC_insert
+*
+* registra i controlli di produzione OK / KO (con note)
+*
+*
+* modif.: Steamware
+* modif: 2018.03.12 gestione x Jetco controlli
+**************************************/
+CREATE PROCEDURE [dbo].[stp_RC_insert]
+(
+ @IdxMacchina NVARCHAR(50),
+ @MatrOpr INT,
+ @EsitoOk BIT,
+ @Note NVARCHAR(50),
+ @DataOra DATETIME = NULL
+)
+AS
+BEGIN
+
+ SET NOCOUNT ON;
+ SET XACT_ABORT ON;
+
+ IF @DataOra IS NULL SET @DataOra = GETDATE()
+ -- imposto valori accessori
+ DECLARE @IdxODL INT = 0
+ DECLARE @CodArticolo NVARCHAR(50) = 'ND'
+
+ -- recupero da tab ODL il codice odl stesso e l'articolo data macchina e data/ora...
+ SELECT @IdxODL = ISNULL(IdxODL,0), @CodArticolo = ISNULL(CodArticolo,'-')
+ FROM ODL
+ WHERE IdxMacchina = @IdxMacchina
+ AND DataInizio <= @DataOra
+ AND ISNULL(DataFine, GETDATE()) >= @DataOra
+ -- verifica parametri...
+ --SELECT @DataOra, @IdxMacchina, @IdxODL, @CodArticolo, @MatrOpr, @EsitoOk, @Note
+
+ -- insert valori!
+ INSERT INTO RegistroControlli (DataOra,IdxMacchina,IdxODL,CodArticolo,MatrOpr,EsitoOK,Note)
+ VALUES (@DataOra, @IdxMacchina, @IdxODL, @CodArticolo, @MatrOpr, @EsitoOk, @Note)
+
+END
+GO