Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -524,7 +524,7 @@ public class MmposServices {
|
|||||||
String opTrans = row.getOpTrans();
|
String opTrans = row.getOpTrans();
|
||||||
if (!UtilityString.isNullOrEmpty(opTrans) &&
|
if (!UtilityString.isNullOrEmpty(opTrans) &&
|
||||||
!opTrans.toUpperCase().startsWith("ORD") &&
|
!opTrans.toUpperCase().startsWith("ORD") &&
|
||||||
!opTrans.toUpperCase().startsWith("RS")) {
|
!row.getFlTrans().toUpperCase().startsWith("RS")) {
|
||||||
ntbDocr.setCausaleReso(opTrans);
|
ntbDocr.setCausaleReso(opTrans);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,11 +35,7 @@ public class ScontriniImporterUtilities {
|
|||||||
return AnomalieDTO.warning(e.getMessage());
|
return AnomalieDTO.warning(e.getMessage());
|
||||||
} else if (e instanceof FileNotFoundException) {
|
} else if (e instanceof FileNotFoundException) {
|
||||||
return AnomalieDTO.error(e);
|
return AnomalieDTO.error(e);
|
||||||
} else {
|
|
||||||
return AnomalieDTO.error(e);
|
|
||||||
}
|
}
|
||||||
|
return AnomalieDTO.error(e);
|
||||||
return null;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user