diff --git a/ES3/WebUserControls/cmp_machParams.ascx b/ES3/WebUserControls/cmp_machParams.ascx index f713d210..4286d77c 100644 --- a/ES3/WebUserControls/cmp_machParams.ascx +++ b/ES3/WebUserControls/cmp_machParams.ascx @@ -1,20 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_machParams.ascx.cs" Inherits="ES3.WebUserControls.cmp_machParams" %>
-
- Impianto  - - - +
+ aggiungere select + edit
- Clona -
-
- Nuovo + Mancanti
- aggiungere select + edit diff --git a/ES3/WebUserControls/cmp_machParams.ascx.cs b/ES3/WebUserControls/cmp_machParams.ascx.cs index 322f7436..eb65c6a1 100644 --- a/ES3/WebUserControls/cmp_machParams.ascx.cs +++ b/ES3/WebUserControls/cmp_machParams.ascx.cs @@ -1,4 +1,5 @@ -using System; +using MapoDb; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -53,7 +54,7 @@ namespace ES3.WebUserControls memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); #endif grView.SelectedIndex = -1; - grView.DataBind(); + doUpdate(); #if false divEditQta.Visible = false; mod_newPromessaODL.Visible = false; @@ -65,5 +66,12 @@ namespace ES3.WebUserControls } #endif } + + protected void lbtAddNew_Click(object sender, EventArgs e) + { + // aggiungo macchine con parametri mancanti... MULTI --> OEE madre a 0%!!! + DataLayer.obj.taMacParams.insMissing(); + doUpdate(); + } } } \ No newline at end of file diff --git a/ES3/WebUserControls/cmp_machParams.ascx.designer.cs b/ES3/WebUserControls/cmp_machParams.ascx.designer.cs index 7f7f749b..70e8b31c 100644 --- a/ES3/WebUserControls/cmp_machParams.ascx.designer.cs +++ b/ES3/WebUserControls/cmp_machParams.ascx.designer.cs @@ -14,33 +14,6 @@ namespace ES3.WebUserControls public partial class cmp_machParams { - /// - /// Controllo ddlMacchine. - /// - /// - /// 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.DropDownList ddlMacchine; - - /// - /// Controllo odsMacc. - /// - /// - /// 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.ObjectDataSource odsMacc; - - /// - /// Controllo lbtClonaSel. - /// - /// - /// 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.LinkButton lbtClonaSel; - /// /// Controllo lbtAddNew. /// diff --git a/Jenkinsfile b/Jenkinsfile index 3bfd97d9..0a21338b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1273']) { + withEnv(['NEXT_BUILD_NUMBER=1276']) { // env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MapoDb/DS_Plan.Designer.cs b/MapoDb/DS_Plan.Designer.cs index 26bcc5a4..70d75b7a 100644 --- a/MapoDb/DS_Plan.Designer.cs +++ b/MapoDb/DS_Plan.Designer.cs @@ -11085,11 +11085,16 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM MachineParams"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_MacPar_insMissing"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11115,6 +11120,28 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod this.Adapter.Fill(dataTable); return dataTable; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int insMissing() { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/MapoDb/DS_Plan.xsd b/MapoDb/DS_Plan.xsd index ea371808..4d2ce893 100644 --- a/MapoDb/DS_Plan.xsd +++ b/MapoDb/DS_Plan.xsd @@ -677,7 +677,18 @@ FROM MachineParams - + + + + + dbo.stp_MacPar_insMissing + + + + + + + @@ -687,7 +698,7 @@ FROM MachineParams - + @@ -698,7 +709,7 @@ FROM MachineParams - + @@ -728,7 +739,7 @@ FROM MachineParams - + @@ -751,7 +762,7 @@ FROM MachineParams - + @@ -774,7 +785,7 @@ FROM MachineParams - + @@ -868,7 +879,7 @@ FROM MachineParams - + @@ -924,7 +935,7 @@ FROM MachineParams - + @@ -1001,7 +1012,7 @@ FROM MachineParams - + @@ -1023,7 +1034,7 @@ FROM MachineParams - + @@ -1037,7 +1048,7 @@ FROM MachineParams - + @@ -1053,7 +1064,7 @@ FROM MachineParams - + @@ -1075,7 +1086,7 @@ FROM MachineParams - + @@ -1136,8 +1147,8 @@ FROM MachineParams - - + + \ No newline at end of file diff --git a/MapoDb/DS_Plan.xss b/MapoDb/DS_Plan.xss index 47a13f13..74415940 100644 --- a/MapoDb/DS_Plan.xss +++ b/MapoDb/DS_Plan.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ 482 - 1179 + 1135 482 diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index ab01fcd1..00f0714f 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -61,6 +61,7 @@ namespace MapoDb public DS_UtilityTableAdapters.CommentiTableAdapter taComm; // table adapter x planner + public DS_PlanTableAdapters.MachineParamsTableAdapter taMacParams; public DS_PlanTableAdapters.CalStopTableAdapter taPlanCalStop; public DS_PlanTableAdapters.CalDispTableAdapter taPlanCalDisp; public DS_PlanTableAdapters.RichiesteTableAdapter taPlanRichieste; @@ -115,14 +116,18 @@ namespace MapoDb taRC = new DS_ProdTempiTableAdapters.RegistroControlliTableAdapter(); taRS = new DS_ProdTempiTableAdapters.RegistroScartiTableAdapter(); taStatoProd = new DS_ProdTempiTableAdapters.StatoProdTableAdapter(); + taSelArt = new DS_UtilityTableAdapters.v_selArticoliTableAdapter(); taSelMacc = new DS_UtilityTableAdapters.v_selMacchineTableAdapter(); taSelOdlFree = new DS_UtilityTableAdapters.v_selODLTableAdapter(); taComm = new DS_UtilityTableAdapters.CommentiTableAdapter(); + + taMacParams = new DS_PlanTableAdapters.MachineParamsTableAdapter(); taPlanCalStop = new DS_PlanTableAdapters.CalStopTableAdapter(); taPlanCalDisp = new DS_PlanTableAdapters.CalDispTableAdapter(); taPlanRichieste = new DS_PlanTableAdapters.RichiesteTableAdapter(); taPromOut = new DS_PlanTableAdapters.PromesseOUTTableAdapter(); + taIstK = new DS_IntServTableAdapters.IstanzeKITTableAdapter(); taAs400 = new DS_IntServTableAdapters.ProduzioneAs400TableAdapter(); taTKS = new DS_IntServTableAdapters.TKS_SearchTableAdapter(); @@ -178,6 +183,7 @@ namespace MapoDb taSelOdlFree.Connection.ConnectionString = connectionString; taComm.Connection.ConnectionString = connectionString; // area planner + taMacParams.Connection.ConnectionString = connectionStringES3; taPlanCalStop.Connection.ConnectionString = connectionStringES3; taPlanCalDisp.Connection.ConnectionString = connectionStringES3; taPlanRichieste.Connection.ConnectionString = connectionStringES3;