Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update x fix errore reset liste in stato 3 (pre-scaricata)

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@440 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2012-03-12 16:38:04 +00:00
parent 46d76c51b8
commit b743baf0db
19 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW/Web.config
+1 -1
View File
@@ -60,7 +60,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="425" />
<add key="minRev" value="426" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW/mazzAppSettings.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="425" />
<add key="minRev" value="426" />
<add key="copyRight" value="SteamWare © 2010-2011" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/mazzAppSettingsSP.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="San Possidonio" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="425" />
<add key="minRev" value="426" />
<add key="copyRight" value="SteamWare © 2010-2011" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/mazzAppSettingsSP_test.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="San Possidonio" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="425" />
<add key="minRev" value="426" />
<add key="copyRight" value="SteamWare © 2010-2011" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/mazzAppSettingsTK.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="425" />
<add key="minRev" value="426" />
<add key="copyRight" value="SteamWare © 2010-2011" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/mazzAppSettingsTK_test.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="425" />
<add key="minRev" value="426" />
<add key="copyRight" value="SteamWare © 2010-2011" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/obj/Debug/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW/obj/Release/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_data/MagClass.cs
+17 -6
View File
@@ -1348,7 +1348,7 @@ namespace GMW_data
/// <param name="CodLista">codice della lista di prelievo</param>
/// <param name="CodSoggetto">cod operatore carrellista</param>
/// <returns></returns>
public esitoOperazione resetListaPrelievo(string CodCS, string CodLista, string CodSoggetto)
public esitoOperazione resetListaPrelievo(string CodCS, string CodLista, string CodSoggetto)
{
memLayer.ML.emptySessionVal("CodListaAttiva");
memLayer.ML.emptySessionVal("activeTask");
@@ -1374,7 +1374,7 @@ namespace GMW_data
string codTipoListaAttuale = riga.CodTipoLista;
// dal tipo lista determino l'evento
string codEvento = taTipoListaPrelievo.getByCodTipoLista(codTipoListaAttuale)[0].CodEvento;
// leggo da righe lista prelievo il dato udc che mi serve
// leggo da righe lista prelievo il dato udc che mi serve
DS_magazzino.RigheListePrelievoDataTable tabellaRigheListaPrelievo = taRigheListePrelievo.getByCodListaPrelevate(CodLista);
DS_magazzino.RigheListePrelievoRow rigaListaPrelievo = tabellaRigheListaPrelievo[0];
// sposto ("metto a terra") gli UDC
@@ -1386,9 +1386,18 @@ namespace GMW_data
// posizione corrente
idxPosizUdcCorr = taCartellini.getDetailsUdcByUdc(_UDC)[0].IdxPosizione;
// calcolo posizione destinazione da state machine...
idxPosizioneTo = StateMachine.SM.taTTPE.getByEventoPosizione(codEvento, idxPosizUdcCorr)[0].IdxPosizioneTo;
idxPosizioneTo = StateMachine.SM.taTTPE.getByEventoPosizione(codEvento, idxPosizUdcCorr)[0].IdxPosizioneTo;
// lo trasformo x avere la cella di destinazione...
idxCellaTo = taCelle.getFirstByPosizione(idxPosizioneTo.ToString())[0].IdxCella;
if (idxPosizUdcCorr < 0)
{
// se parto da cella negativa (consumato) calcolo destinazione da cella TO...
idxCellaTo = taCelle.getFirstByPosizione(idxPosizioneTo.ToString())[0].IdxCella;
}
else
{
// altrimenti uso la posizione corrente (NON faccio vero spostamento...
idxCellaTo = taCelle.getFirstByPosizione(idxPosizUdcCorr.ToString())[0].IdxCella;
}
// sposto UDC
spostaUDC(CodCS, _UDC, idxCellaTo, false);
}
@@ -1410,8 +1419,10 @@ namespace GMW_data
answ = esitoOperazione.errore;
}
}
catch
{ }
catch (Exception e)
{
logger.lg.scriviLog(string.Format("Errore in reset lista prelievo: {0}", e), tipoLog.EXCEPTION);
}
return answ;
}
GMW/GMW_data/bin/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_installer/GMW_installer.vdproj
+3 -3
View File
@@ -306,14 +306,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
"ProductCode" = "8:{817582B4-231A-4EED-8E4C-EF3CCDCCDC02}"
"PackageCode" = "8:{6F5BA588-9A74-440F-A9A1-989D282F4705}"
"ProductCode" = "8:{FC1F8B43-87CB-46E0-A0F8-E8340418AE0F}"
"PackageCode" = "8:{A9F60597-8E35-46CF-B977-4835FC3DD76F}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.425"
"ProductVersion" = "8:1.1.426"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
GMW/GMW_installer/Release/GMW_installer.msi
BIN
View File
Binary file not shown.