diff --git a/GMW/GMW/WebUserControls/mod_creaDatiTest.ascx.cs b/GMW/GMW/WebUserControls/mod_creaDatiTest.ascx.cs
index a5285e90..ba70759f 100644
--- a/GMW/GMW/WebUserControls/mod_creaDatiTest.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_creaDatiTest.ascx.cs
@@ -99,7 +99,7 @@ namespace GMW.WebUserControls
tabUdc = DataProxy.obj.taCartellini.stp_insNew(txtCodCS.Text, txtCodBilancia.Text, string.Format("{0:yy}", DateTime.Now), tara, codImballo, TipoDichiarazione,CodSoggetto, "UDC_TARA");
UDC_Parent = tabUdc[0].UDC;
// creo nuovo cartellino! e ne recupero il nome
- tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(txtCodCS.Text, txtCodBilancia.Text, string.Format("{0:yy}", DateTime.Now), codCliente, Particolare, CodImpianto, CodStampo, esponente, figura, data, turno, codImballo, CodSoggetto, tara, IdxPosizione, TipoDichiarazione, "UDC_PESA", qta, pesoTot, pesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_PESA" è "hard coded" nel db... !!!
+ tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(txtCodCS.Text, txtCodBilancia.Text, string.Format("{0:yy}", DateTime.Now), codCliente, Particolare, CodImpianto, CodStampo, esponente, figura, data, turno, codImballo, CodSoggetto, tara, IdxPosizione, TipoDichiarazione, "UDC_PESA", qta, pesoTot, pesoCad, CodStato, UDC_Parent, false); // ATTENZIONE: "UDC_PESA" è "hard coded" nel db... !!!
udc = tabUdc[0].UDC;
// calcolo la prima posizione libera da riempire...
idxCella = MagClass.magazzino.taCelle.getLibereByIdxBlocco(IdxBlocco)[0].IdxCella;
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 63fd4532..25ebc173 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll
index 64402b5b..ab5e255c 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll
index 138a5124..4792c30b 100644
Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 63fd4532..5e0b6c11 100644
Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
index 5f952280..a4740b9b 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index dad02dc0..25ebc173 100644
Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ
diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache
index 4db0d9ae..9d5e38fd 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css
index 32d07617..51158465 100644
--- a/GMW/GMW_Term/Style.css
+++ b/GMW/GMW_Term/Style.css
@@ -131,6 +131,7 @@
{
display: block;
width: 100px;
+ height:40px;
border: solid 2px red;
background-color: #FFAAAA;
padding: 0px 2px 0px 2px;
@@ -139,6 +140,7 @@
{
display: block;
width: 100px;
+ height:40px;
border: solid 2px green;
background-color: #AAFFAA;
padding: 0px 2px 0px 2px;
@@ -147,6 +149,7 @@
{
display: block;
width: 100px;
+ height:40px;
border: solid 2px blue;
background-color: #AAAAFF;
padding: 0px 2px 0px 2px;
@@ -155,14 +158,16 @@
{
display: block;
width: 100px;
- border: solid 2px yellow;
- background-color: #FFFFAA;
+ height:40px;
+ border: solid 2px red;
+ background-color: #FFAAFF;
padding: 0px 2px 0px 2px;
}
.btnConferma
{
display: block;
width: 100px;
+ height:40px;
border: solid 2px yellow;
background-color: #FFFFAA;
padding: 0px 2px 0px 2px;
@@ -171,22 +176,25 @@
{
display: block;
width: 100px;
- border: solid 2px yellow;
- background-color: #FFFFAA;
+ height:40px;
+ border: solid 2px blue;
+ background-color: #AAFFFF;
padding: 0px 2px 0px 2px;
}
.btnBarcode
{
display: block;
width: 100px;
- border: solid 2px yellow;
- background-color: #FFFFAA;
+ height:40px;
+ border: solid 2px blue;
+ background-color: #AAFFFF;
padding: 0px 2px 0px 2px;
}
.btnChiudi
{
display: block;
width: 100px;
+ height:40px;
border: solid 2px yellow;
background-color: #FFFFAA;
padding: 0px 2px 0px 2px;
@@ -195,7 +203,8 @@
{
display: block;
width: 100px;
- border: solid 2px yellow;
- background-color: #FFFFAA;
+ height:40px;
+ border: solid 2px red;
+ background-color: #FFAAFF;
padding: 0px 2px 0px 2px;
}
diff --git a/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx b/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx
index cbeaa62c..889f0c8e 100644
--- a/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx
+++ b/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx
@@ -2,12 +2,20 @@
Inherits="GMW_Term.WebUserControls.mod_btnUdc" %>
@@ -17,18 +25,28 @@
diff --git a/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs
index 874f5ae8..c772f6c9 100644
--- a/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs
@@ -208,8 +208,8 @@ namespace GMW_Term.WebUserControls
pnlButtons.Visible = false;
pnlInput.Visible = true;
lblData.Text = "";
- btnConferma.Enabled = false;
- btnCellaPiena.Enabled = false;
+ btnConferma.Visible = false;
+ btnCellaPiena.Visible = false;
}
///
/// sistemo abilitazione buttons (a seconda dello stato dell'UDC)
@@ -239,32 +239,32 @@ namespace GMW_Term.WebUserControls
// in base a che sia in una posizione magazzino o meno scelgo che buttons abilitare
if (posizAssegn)
{
- btnDeposita.Enabled = false;
- btnSposta.Enabled = true;
+ btnDeposita.Visible = false;
+ btnSposta.Visible = true;
}
else
{
- btnDeposita.Enabled = true;
- btnSposta.Enabled = false;
+ btnDeposita.Visible = true;
+ btnSposta.Visible = false;
}
- btnRettifica.Enabled = true;
+ btnRettifica.Visible = true;
}
else
{
- btnDeposita.Enabled = false;
- btnSposta.Enabled = false;
- btnRettifica.Enabled = false;
+ btnDeposita.Visible = false;
+ btnSposta.Visible = false;
+ btnRettifica.Visible = false;
}
// permetto dichiudere sempre
- btnChiudi.Enabled = true;
+ btnChiudi.Visible = true;
// button preleva abilitato SOLO SE c'è una lista di prelievo attiva per l'utente e per il particolare corrente... e se l'UDC non è stato prelevato
if (_CodLista != "" && (_PartLdP == _PartUdc) && _UdcDisp)
{
- btnPreleva.Enabled = true;
+ btnPreleva.Visible = true;
}
else
{
- btnPreleva.Enabled = false;
+ btnPreleva.Visible = false;
}
setupBtnChiudi();
}
@@ -424,7 +424,7 @@ namespace GMW_Term.WebUserControls
lblData.Text = traduci("Box") + ": " + txtScansione;
txtScansione = "";
// mostro btnConferma
- btnConferma.Enabled = true;
+ btnConferma.Visible = true;
// metto focus
btnConferma.Focus();
// controllo se la cella sia "papabile" per indicazione "piena"
@@ -440,12 +440,12 @@ namespace GMW_Term.WebUserControls
{ }
if (alertCapa && !(cellaPiena))
{
- btnCellaPiena.Enabled = true;
+ btnCellaPiena.Visible = true;
btnCellaPiena.Focus();
}
else
{
- btnCellaPiena.Enabled = false;
+ btnCellaPiena.Visible = false;
}
break;
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index e9f659f9..4b0d263a 100644
Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ
diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll
index e9f659f9..4b0d263a 100644
Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ
diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs
index ab38506b..fa74a82e 100644
--- a/GMW/GMW_WS/bilance.asmx.cs
+++ b/GMW/GMW_WS/bilance.asmx.cs
@@ -350,7 +350,7 @@ namespace GMW_WS
IdxPosizione = memLayer.ML.confReadInt("IdxPosNewFusi");
}
// creo nuovo cartellino!
- DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_PESA", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_PESA" è "hard coded" nel db... !!!
+ DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_PESA", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent, false); // ATTENZIONE: "UDC_PESA" è "hard coded" nel db... !!!
// se NON richiesto di generare movimento a magazzino crea rettifica in tab batch
if (!toAS400)
{
@@ -416,7 +416,7 @@ namespace GMW_WS
IdxPosizione = memLayer.ML.confReadInt("IdxPosNewFinito");
}
// creo nuovo cartellino!
- DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_FINITO", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_FINITO" è "hard coded" nel db... !!!
+ DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_FINITO", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent, false); // ATTENZIONE: "UDC_FINITO" è "hard coded" nel db... !!!
// se NON richiesto di generare movimento a magazzino crea rettifica in tab batch
if (!toAS400)
{
@@ -426,8 +426,10 @@ namespace GMW_WS
try
{
answ = tabUdc[0].UDC;
- // salvo associazioen parent-child tra UDC!
- DataProxy.obj.taRelazUDC.Insert(UDC_Parent, answ);
+#if false
+ // salvo associazione parent-child tra UDC!
+ DataProxy.obj.taRelazUDC.Insert(UDC_Parent, answ);
+#endif
}
catch
{ }
@@ -482,7 +484,7 @@ namespace GMW_WS
IdxPosizione = memLayer.ML.confReadInt("IdxPosNewWip");
}
// creo nuovo cartellino!
- DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_WIP", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent); // ATTENZIONE: "UDC_WIP" è "hard coded" nel db... !!!
+ DS_Applicazione.ElencoCartelliniDataTable tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilancia, string.Format("{0:yy}", DateTime.Now), CodCliente, Particolare, CodImpianto, CodStampo, Esponente, Figura, DataRif, TurnoRif, CodImballo, CodSoggetto, Tara, IdxPosizione, CodTipoDichiarazione, "UDC_WIP", Quantita, PesoTot, PesoCad, CodStato, UDC_Parent, false); // ATTENZIONE: "UDC_WIP" è "hard coded" nel db... !!!
// se NON richiesto di generare movimento a magazzino crea rettifica in tab batch
if (!toAS400)
{
diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll
index c6007ecc..25ebc173 100644
Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ
diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll
index 7ff1edfc..d55250dd 100644
Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll
index ce8ac84a..ab5e255c 100644
Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ
diff --git a/GMW/GMW_WS/bin/SteamWare.dll b/GMW/GMW_WS/bin/SteamWare.dll
index 138a5124..4792c30b 100644
Binary files a/GMW/GMW_WS/bin/SteamWare.dll and b/GMW/GMW_WS/bin/SteamWare.dll differ
diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll
index 7ff1edfc..1312c725 100644
Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.dll and b/GMW/GMW_WS/obj/Debug/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache
index c83f5892..cf539851 100644
Binary files a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll
index adacb1c2..d55250dd 100644
Binary files a/GMW/GMW_WS/obj/Release/GMW_WS.dll and b/GMW/GMW_WS/obj/Release/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache
index 1cdd7bf4..7de5f9ef 100644
Binary files a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi
index 612ae134..56931d17 100644
Binary files a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi and b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi differ
diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs
index 50748ee3..e2c36a3a 100644
--- a/GMW/GMW_data/DS_Applicazione.Designer.cs
+++ b/GMW/GMW_data/DS_Applicazione.Designer.cs
@@ -12524,6 +12524,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoCad", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStato", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_parent", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DoDeleteUdcParent", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = "dbo.stp_rettMovAs400";
@@ -12690,7 +12691,8 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
global::System.Nullable PesoTot,
global::System.Nullable PesoCad,
string CodStato,
- string UDC_parent) {
+ string UDC_parent,
+ global::System.Nullable DoDeleteUdcParent) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((CodCS == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -12824,6 +12826,12 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
else {
this.Adapter.SelectCommand.Parameters[22].Value = ((string)(UDC_parent));
}
+ if ((DoDeleteUdcParent.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[23].Value = ((bool)(DoDeleteUdcParent.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[23].Value = global::System.DBNull.Value;
+ }
DS_Applicazione.ElencoCartelliniDataTable dataTable = new DS_Applicazione.ElencoCartelliniDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd
index a999c328..b15982ce 100644
--- a/GMW/GMW_data/DS_Applicazione.xsd
+++ b/GMW/GMW_data/DS_Applicazione.xsd
@@ -725,7 +725,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
-
+
dbo.stp_UDC_insNewFull
@@ -751,6 +751,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
+
@@ -1376,8 +1377,8 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
-
+
+
@@ -1390,14 +1391,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
@@ -1410,14 +1411,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
@@ -1430,14 +1431,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
@@ -1450,35 +1451,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
+
-
+
-
+
@@ -1491,35 +1492,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
+
-
+
-
+
@@ -1532,21 +1533,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
+
@@ -1559,93 +1560,93 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -1659,28 +1660,28 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -1707,96 +1708,96 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1878,14 +1879,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
@@ -1898,157 +1899,157 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -2061,42 +2062,42 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2109,14 +2110,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
@@ -2129,21 +2130,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto =
-
+
-
+
-
+
diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss
index 3dd34e35..f485cdab 100644
--- a/GMW/GMW_data/DS_Applicazione.xss
+++ b/GMW/GMW_data/DS_Applicazione.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs
index 125bda67..f50b3abd 100644
--- a/GMW/GMW_data/MagClass.cs
+++ b/GMW/GMW_data/MagClass.cs
@@ -1064,7 +1064,7 @@ namespace GMW_data
answ = true;
// per ogni riga creo un UDC
- DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNewFull(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), rqRow.CodFor, rqRow.CodLega, "", "", "", "", DateTime.Now, 0, memLayer.ML.confReadString("CodImballoMP"), CodSoggCurrUser, 0, memLayer.ML.confReadInt("IdxPosizMP"), "M", "UDC_MP", rqRow.Qta, Convert.ToDouble(rqRow.Qta), 1, memLayer.ML.confReadString("CodStatoMP"), ""); // UDC_MP HARD CODED!!!
+ DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNewFull(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), rqRow.CodFor, rqRow.CodLega, "", "", "", "", DateTime.Now, 0, memLayer.ML.confReadString("CodImballoMP"), CodSoggCurrUser, 0, memLayer.ML.confReadInt("IdxPosizMP"), "M", "UDC_MP", rqRow.Qta, Convert.ToDouble(rqRow.Qta), 1, memLayer.ML.confReadString("CodStatoMP"), "", false); // UDC_MP HARD CODED!!!
//DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNew(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), 0, memLayer.ML.confReadString("CodImballoMP"), "M", CodOperatore, "UDC_MP"); // UDC_MP HARD CODED!!!
try
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 92f8b662..0016d53d 100644
Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index c2387366..ab5e255c 100644
Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ
diff --git a/GMW/GMW_data/bin/Release/SteamWare.dll b/GMW/GMW_data/bin/Release/SteamWare.dll
index 138a5124..4792c30b 100644
Binary files a/GMW/GMW_data/bin/Release/SteamWare.dll and b/GMW/GMW_data/bin/Release/SteamWare.dll differ
diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index 92f8b662..0016d53d 100644
Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
index d207c93b..27365de5 100644
Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index c2387366..ab5e255c 100644
Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache
index fa07b644..36c25072 100644
Binary files a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
index 7af00443..5cb676d9 100644
Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ