diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 2e918b9d..6859191b 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 26ec2dcd..40fd53e2 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 1876c9eb..6859191b 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 1fb0661c..70df47bf 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 0a918e17..40fd53e2 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 0a918e17..40fd53e2 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/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
index c41780c6..d378b829 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
diff --git a/GMW/GMW_deploy/Release/bin/GMW.dll b/GMW/GMW_deploy/Release/bin/GMW.dll
index 1876c9eb..6859191b 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 0a918e17..40fd53e2 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 96305b22..2e918b9d 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 b0d32dc2..9c8fef65 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 1876c9eb..6859191b 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 1fb0661c..70df47bf 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 a9aa5709..05951735 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.7")]
+ [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.9")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
public class bilance : System.Web.Services.WebService
@@ -46,7 +46,14 @@ namespace GMW.WS
{
return DataProxy.obj.taAnagImp.GetData();
}
-
+ ///
+ /// fornisce l'anagrafica impianti dati codice company e sito
+ ///
+ [WebMethod(Description = "Elenco anagrafico impianti dati codice company e sito")]
+ public GMW_data.DS_Applicazione.AnagImpiantiDataTable AnagImpiantiByCompanySito(string CodCompany, string CodSito)
+ {
+ return DataProxy.obj.taAnagImp.getByCompanySito(CodCompany, CodSito);
+ }
#endregion
#region area gestione stati & UDC
@@ -60,6 +67,16 @@ namespace GMW.WS
return DataProxy.obj.taImp2Art.GetData();
}
///
+ /// fornisce l'elenco di impianti ed articoli attualmente in produzione (per codice anagrafico)
+ ///
+ /// CodImpianto come da anagrafica
+ ///
+ [WebMethod(Description = "Elenco impianti ed articoli attualmente in produzione (per codice anagrafico)")]
+ public GMW_data.DS_Applicazione.Impianti2ArticoliDataTable Art4Impianto(string CodImpianto)
+ {
+ return DataProxy.obj.taImp2Art.getCurrByImpianto(CodImpianto);
+ }
+ ///
/// Fornisce un UDC a partire dalla richiesta e salva i dati
///
/// posizione che effettua la richiesta (codice della pesa)
@@ -69,7 +86,14 @@ namespace GMW.WS
public string UdcGetNew(string place, float tara)
{
// genero un codice pseudo-casuale formattato
- return string.Format("PS{0:yyMMddHHmmss}", DateTime.Now);
+ return string.Format("AM{0}{1:yy}{2}", place.Substring(0,2), (DateTime.Now.Ticks/100).ToString().Substring(0,6));
+ /*
+ * aabbcc123456
+aa= company
+bb= postaz
+cc=anno
+123456= progressivo
+ * */
}
///
/// Richiede la tara per l'UDC indicato
@@ -85,10 +109,11 @@ namespace GMW.WS
/// Salva i dati aggiornati per l'UDC in quanto a numero pezzi associati
///
/// codice dell'UDC
+ /// codice dell'articolo + figura
/// 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, int numPezzi)
+ public bool UdcUpdate(string UDC, string CodArticolo, int numPezzi)
{
bool answ = true;
// qui dovrei salvare sia nel log delle info che nello stato UDC le informazioni fornitemi
@@ -96,7 +121,6 @@ namespace GMW.WS
return answ;
}
-
#endregion
#region area stampe
diff --git a/GMW/GMW_deploy/Source/bin/GMW.dll b/GMW/GMW_deploy/Source/bin/GMW.dll
index 1876c9eb..6859191b 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 0a918e17..40fd53e2 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 96305b22..2e918b9d 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 b0d32dc2..9c8fef65 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 1876c9eb..6859191b 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 1fb0661c..70df47bf 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 79c982cf..36e3233d 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ
diff --git a/GMW/GMW_installer/Release/GMW_installer.piz b/GMW/GMW_installer/Release/GMW_installer.piz
index 25c0d8f6..d43b4ee9 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.piz and b/GMW/GMW_installer/Release/GMW_installer.piz differ