diff --git a/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs b/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
index 44b3a6f8..2837e633 100644
--- a/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
+++ b/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
@@ -1,10 +1,6 @@
using SteamWare;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
using System.Web.UI;
-using System.Web.UI.WebControls;
namespace MoonProAdmin.WebUserControls
{
@@ -48,8 +44,9 @@ namespace MoonProAdmin.WebUserControls
///
protected void btnOk_Click(object sender, EventArgs e)
{
- // controllo se ho tutti i valori ok...
+ // controllo se ho tutti i valori ok...
string CodArticolo = "";
+ string Gruppo = "";
string IdxMacchina = "";
string KeyReq = "";
int numPezzi = 0;
@@ -61,6 +58,7 @@ namespace MoonProAdmin.WebUserControls
try
{
CodArticolo = ddlArticolo.SelectedValue;
+ Gruppo = ddlGruppi.SelectedValue;
IdxMacchina = ddlMacchine.SelectedValue;
KeyReq = txKeyExt.Text.Trim();
//IdxMacchina = txtMacchina.Text.Trim();
@@ -81,7 +79,7 @@ namespace MoonProAdmin.WebUserControls
int.TryParse(txtPrio.Text, out prio);
// 2018.09.25 --> inserisco PROMESSA ODL
//MapoDb.DataLayer.obj.taODL.InsertQuery(CodArticolo, MapoDb.DataLayer.MatrOpr, IdxMacchina, numPezzi, TCiclo, pzPallet, chkToAs400.Checked, txtCommessa.Text.Trim());
- MapoDb.DataLayer.obj.taPODL.insertQuery(KeyReq, KeyReq, attiv, CodArticolo, "", IdxMacchina, numPezzi, TCiclo, DateTime.Now, prio, pzPallet);
+ MapoDb.DataLayer.obj.taPODL.insertQuery(KeyReq, KeyReq, attiv, CodArticolo, Gruppo, IdxMacchina, numPezzi, TCiclo, DateTime.Now, prio, pzPallet);
}
catch (Exception exc)
{
diff --git a/MapoDb/DS_Utility.Designer.cs b/MapoDb/DS_Utility.Designer.cs
index f311dfd6..0e1114d5 100644
--- a/MapoDb/DS_Utility.Designer.cs
+++ b/MapoDb/DS_Utility.Designer.cs
@@ -7788,7 +7788,7 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT value, label\r\nFROM v_selMacchine\r\nORDER BY label";
@@ -7798,6 +7798,12 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
this._commandCollection[1].CommandText = "dbo.stp_vsm_attive";
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, "", "", ""));
+ this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[2].Connection = this.Connection;
+ this._commandCollection[2].CommandText = "dbo.stp_vsm_getByConditio";
+ this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[2].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, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conditio", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7834,6 +7840,23 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
this.Adapter.Fill(dataTable);
return dataTable;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+ public virtual DS_Utility.v_selMacchineDataTable getByConditio(string conditio) {
+ this.Adapter.SelectCommand = this.CommandCollection[2];
+ if ((conditio == null)) {
+ this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[1].Value = ((string)(conditio));
+ }
+ DS_Utility.v_selMacchineDataTable dataTable = new DS_Utility.v_selMacchineDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
}
///
diff --git a/MapoDb/DS_Utility.xsd b/MapoDb/DS_Utility.xsd
index 7b569f9e..3fff51d2 100644
--- a/MapoDb/DS_Utility.xsd
+++ b/MapoDb/DS_Utility.xsd
@@ -240,6 +240,17 @@ ORDER BY label
+
+
+
+ dbo.stp_vsm_getByConditio
+
+
+
+
+
+
+
@@ -516,7 +527,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -530,7 +541,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -545,7 +556,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -559,7 +570,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -579,7 +590,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -648,7 +659,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -684,7 +695,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -735,7 +746,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -743,7 +754,7 @@ FROM dbo.v_selCauScarto
-
+
@@ -777,7 +788,7 @@ FROM dbo.v_selCauScarto
-
+
diff --git a/MapoDb/DS_Utility.xss b/MapoDb/DS_Utility.xss
index 0be07bc3..832b2904 100644
--- a/MapoDb/DS_Utility.xss
+++ b/MapoDb/DS_Utility.xss
@@ -4,19 +4,20 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file