Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
This commit is contained in:
@@ -263,9 +263,7 @@ public class MmposServices {
|
||||
multiDBTransactionManager.commitAll();
|
||||
entityReturn.add(ntbDoct);
|
||||
} catch (Exception e) {
|
||||
if (!(e instanceof EntityException && ((EntityException) e).getSqlErrorCode() == 2627)) {
|
||||
anomalie.add(ScontriniImporterUtilities.setAnomalia(e));
|
||||
}
|
||||
anomalie.add(ScontriniImporterUtilities.setAnomalia(e));
|
||||
multiDBTransactionManager.rollbackAll();
|
||||
}
|
||||
}
|
||||
@@ -387,10 +385,10 @@ public class MmposServices {
|
||||
NtbDocr ntbDocr = new NtbDocr();
|
||||
righe.add(ntbDocr);
|
||||
ntbDocr
|
||||
.setBarCode(row.getCodice() != null? row.getCodice().trim(): null)
|
||||
.setCodMart(row.getCodInter() != null? row.getCodInter().trim():null)
|
||||
.setReparto(row.getCodRep() !=null ? row.getCodRep().trim():null)
|
||||
.setDescrizione(row.getDesRidot() != null? row.getDesRidot().trim():null);
|
||||
.setBarCode(row.getCodice() != null ? row.getCodice().trim() : null)
|
||||
.setCodMart(row.getCodInter() != null ? row.getCodInter().trim() : null)
|
||||
.setReparto(row.getCodRep() != null ? row.getCodRep().trim() : null)
|
||||
.setDescrizione(row.getDesRidot() != null ? row.getDesRidot().trim() : null);
|
||||
|
||||
String promozione = row.getKeysRef();
|
||||
|
||||
@@ -524,7 +522,9 @@ public class MmposServices {
|
||||
}
|
||||
|
||||
String opTrans = row.getOpTrans();
|
||||
if (!UtilityString.isNullOrEmpty(opTrans) && !opTrans.toUpperCase().startsWith("ORD")) {
|
||||
if (!UtilityString.isNullOrEmpty(opTrans) &&
|
||||
!opTrans.toUpperCase().startsWith("ORD") &&
|
||||
!opTrans.toUpperCase().startsWith("RS")) {
|
||||
ntbDocr.setCausaleReso(opTrans);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user