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

fix split ODL...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-01-14 17:45:26 +01:00
parent 6558921949
commit b147536cf9
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1143']) {
withEnv(['NEXT_BUILD_NUMBER=1144']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+16 -12
View File
@@ -105,7 +105,7 @@ namespace MoonProTablet.WebUserControls
if (emptyOdlMacc)
{
// ora verifico SE ALTRA TAVOLA ha ODL...
if (emptyOdlAltraMacc)
if (!emptyOdlAltraMacc)
{
answ = memLayer.ML.cdvb("showSplitOdlOnTav");
}
@@ -580,19 +580,23 @@ namespace MoonProTablet.WebUserControls
protected decimal TCAssegnato(int idxODL)
{
decimal answ = 0;
if (enableRPO)
try
{
// leggo info da promessa...
var rigaProm = DataLayer.obj.taPODL.getByKey(idxODL)[0];
answ = rigaProm.TCAssegnato;
}
else
{
// leggo idxOdl da ultimo odl attivo x macchina
DS_ProdTempi.ODLRow rigaOdl = DataLayer.obj.taODL.getByIdx(idxODL, false)[0];
answ = rigaOdl.TCAssegnato;
if (enableRPO)
{
// leggo info da promessa...
var rigaProm = DataLayer.obj.taPODL.getByKey(idxODL)[0];
answ = rigaProm.TCAssegnato;
}
else
{
// leggo idxOdl da ultimo odl attivo x macchina
DS_ProdTempi.ODLRow rigaOdl = DataLayer.obj.taODL.getByIdx(idxODL, false)[0];
answ = rigaOdl.TCAssegnato;
}
}
catch
{ }
return answ;
}
/// <summary>