diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 1a1a926d..6d879925 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 ea7cca5d..ee9064f1 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 2a90c2c0..6980cf83 100644
Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 34692d7a..6d879925 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 ad398b09..9b6a4249 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index 0246e04c..ee9064f1 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/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index 0246e04c..ee9064f1 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_deploy/Release/bin/GMW.dll b/GMW/GMW_deploy/Release/bin/GMW.dll
index 34692d7a..6d879925 100644
Binary files a/GMW/GMW_deploy/Release/bin/GMW.dll and b/GMW/GMW_deploy/Release/bin/GMW.dll differ
diff --git a/GMW/GMW_deploy/Release/bin/GMW_data.dll b/GMW/GMW_deploy/Release/bin/GMW_data.dll
index 0246e04c..ee9064f1 100644
Binary files a/GMW/GMW_deploy/Release/bin/GMW_data.dll and b/GMW/GMW_deploy/Release/bin/GMW_data.dll differ
diff --git a/GMW/GMW_deploy/Release/obj/Debug/GMW.dll b/GMW/GMW_deploy/Release/obj/Debug/GMW.dll
index 6f59fbd4..1a1a926d 100644
Binary files a/GMW/GMW_deploy/Release/obj/Debug/GMW.dll and b/GMW/GMW_deploy/Release/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache
index 5e07dd95..e15e3354 100644
Binary files a/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_deploy/Release/obj/Release/GMW.dll b/GMW/GMW_deploy/Release/obj/Release/GMW.dll
index 34692d7a..6d879925 100644
Binary files a/GMW/GMW_deploy/Release/obj/Release/GMW.dll and b/GMW/GMW_deploy/Release/obj/Release/GMW.dll differ
diff --git a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache
index ad398b09..9b6a4249 100644
Binary files a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
index a4dacf2e..3d9ea5c2 100644
--- a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
+++ b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
@@ -10,7 +10,7 @@ namespace GMW.WS
///
/// Summary description for bilance
///
- [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.0.9.10")]
+ [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.0.9.11")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
public class bilance : System.Web.Services.WebService
@@ -105,17 +105,20 @@ namespace GMW.WS
{
// ricavo cod company...
string CodCompany = "ND";
+ string CodSito = "ND";
string answ = "NA";
try
{
CodCompany = DataProxy.obj.taAnagBil.getByCod(CodBilancia)[0].CodCompany;
+ CodSito = DataProxy.obj.taAnagBil.getByCod(CodBilancia)[0].CodSito;
}
catch
{
CodCompany = DataProxy.obj.taAnagBil.GetData()[0].CodCompany;
+ CodSito = DataProxy.obj.taAnagBil.GetData()[0].CodSito;
}
// inserico riga generando il codice
- DS_Applicazione.TabStatoOdpUdcDataTable tabUdc = DataProxy.obj.taStatoOdpUdc.stp_insNewOdpUdc(CodCompany, CodBilancia, string.Format("{0:yy}", DateTime.Now), "ND", tara);
+ DS_Applicazione.TabStatoOdpUdcDataTable tabUdc = DataProxy.obj.taStatoOdpUdc.stp_insNewOdpUdc(CodCompany, CodSito, CodBilancia, string.Format("{0:yy}", DateTime.Now), "ND", tara);
// leggo la riga
try
{
@@ -146,16 +149,40 @@ namespace GMW.WS
///
/// Salva i dati aggiornati per l'UDC in quanto a numero pezzi associati
///
+ /// codice anagrafico della bilanca che effettua la richiesta (codice della pesa)
/// codice dell'UDC
/// codice dell'articolo + figura
- /// numero pezzi associati all'UDC
+ /// numero pezzi associati all'UDC
/// restituisce true/false a seconda che sia riuscito a salvare o meno i dati
[WebMethod(Description = "Salva i dati aggiornati per l'UDC in quanto a numero pezzi associati")]
- public bool UdcUpdate(string UDC, string CodArticolo, int numPezzi)
+ public bool UdcUpdate(string CodBilancia, string UDC, string CodArticolo, int qta)
{
- bool answ = true;
- // qui dovrei salvare sia nel log delle info che nello stato UDC le informazioni fornitemi
-
+ // init
+ bool answ = false;
+ // ricavo cod company...
+ string CodCompany = "ND";
+ try
+ {
+ CodCompany = DataProxy.obj.taAnagBil.getByCod(CodBilancia)[0].CodCompany;
+ }
+ catch
+ {
+ CodCompany = DataProxy.obj.taAnagBil.GetData()[0].CodCompany;
+ }
+ // faccio update!
+ DS_Applicazione.TabStatoOdpUdcDataTable tabUdc = DataProxy.obj.taStatoOdpUdc.updateByBilancia(CodCompany, UDC, CodArticolo, qta);
+ // leggo la riga con la qta
+ try
+ {
+ decimal qtaIns = tabUdc[0].Qta;
+ if (qtaIns == qta)
+ {
+ // allora ha aggiornato!
+ answ = true;
+ }
+ }
+ catch
+ { }
return answ;
}
diff --git a/GMW/GMW_deploy/Source/bin/GMW.dll b/GMW/GMW_deploy/Source/bin/GMW.dll
index 34692d7a..6d879925 100644
Binary files a/GMW/GMW_deploy/Source/bin/GMW.dll and b/GMW/GMW_deploy/Source/bin/GMW.dll differ
diff --git a/GMW/GMW_deploy/Source/bin/GMW_data.dll b/GMW/GMW_deploy/Source/bin/GMW_data.dll
index 0246e04c..ee9064f1 100644
Binary files a/GMW/GMW_deploy/Source/bin/GMW_data.dll and b/GMW/GMW_deploy/Source/bin/GMW_data.dll differ
diff --git a/GMW/GMW_deploy/Source/obj/Debug/GMW.dll b/GMW/GMW_deploy/Source/obj/Debug/GMW.dll
index 6f59fbd4..1a1a926d 100644
Binary files a/GMW/GMW_deploy/Source/obj/Debug/GMW.dll and b/GMW/GMW_deploy/Source/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache
index 5e07dd95..e15e3354 100644
Binary files a/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_deploy/Source/obj/Release/GMW.dll b/GMW/GMW_deploy/Source/obj/Release/GMW.dll
index 34692d7a..6d879925 100644
Binary files a/GMW/GMW_deploy/Source/obj/Release/GMW.dll and b/GMW/GMW_deploy/Source/obj/Release/GMW.dll differ
diff --git a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache
index ad398b09..9b6a4249 100644
Binary files a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 8cdda59e..85a8706b 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ