Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix comportamento tablet x perdita sel numPzPallet + display ODL

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-12 17:33:44 +02:00
parent e4ce734306
commit ab2e3040bd
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1422']) {
withEnv(['NEXT_BUILD_NUMBER=1423']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/WebUserControls/BaseUserControl.cs
+11 -3
View File
@@ -227,6 +227,11 @@ namespace MoonProTablet.WebUserControls
set
{
memLayer.ML.setSessionVal("idxODL", value);
// resetto cache redis
if(value==0)
{
DataLayerObj.emptyCurrODL(idxMacchina);
}
}
}
@@ -235,10 +240,13 @@ namespace MoonProTablet.WebUserControls
get
{
string answ = "";
var odlDetail = DataLayerObj.currODLRowTab(idxMacchina);
if (odlDetail != null && odlDetail.Rows.Count > 0)
if (idxOdl > 0)
{
answ = odlDetail[0].KeyRichiesta;
var odlDetail = DataLayerObj.currODLRowTab(idxMacchina);
if (odlDetail != null && odlDetail.Rows.Count > 0)
{
answ = odlDetail[0].KeyRichiesta;
}
}
return answ;
}
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+6 -2
View File
@@ -1319,8 +1319,12 @@ namespace MoonProTablet.WebUserControls
// leggo idxOdl da ultimo odl attivo x macchina
int idxODLStart = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
int idxEvento = 1; // !!!HARD CODED
// aggiorno (se necessario) note e tempo setup
DataLayerObj.taODL.updateSetup(idxODLStart, DataLayerObj.MatrOpr, TCRichAttr, PzPallet, txtNote.Text);
// se le note sono visibili
if (divNote.Visible)
{
// aggiorno (se necessario) note e tempo setup
DataLayerObj.taODL.updateSetup(idxODLStart, DataLayerObj.MatrOpr, TCRichAttr, PzPallet, txtNote.Text);
}
// controllo se TC Assegnato != TCRichiesto allora invio email x verifiche...
DS_ProdTempi.ODLRow rigaOdl = DataLayerObj.taODL.getByIdx(idxODLStart, false)[0];
if (rigaOdl.TCAssegnato != TCRichAttr)
MapoDb/DataLayer.cs
+1
View File
@@ -1450,6 +1450,7 @@ namespace MapoDb
try
{
memLayer.ML.redDelKey(currODLHash(idxMacchina));
memLayer.ML.redDelKey(currOdlRowHash(idxMacchina));
answ = "OK";
}
catch