Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Marco Elefante
2024-01-15 15:30:24 +01:00
parent 91a61f336a 59a06e67cd
commit 29ebded325
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ems-engine/src/main/java/it/integry/ems/document/service/DocumentProdService.java
View File

@@ -3584,24 +3584,27 @@ public class DocumentProdService {
docsToPersist.add(doc);
docsToPersist.add(clav);
for (DtbDocr row : doc.getDtbDocr()) {
DtbDocr clavRow = (DtbDocr) row.clone();
clavRow.setOperation(OperationType.INSERT);
clavRow.setCodDtip(null);
clavRow.setCodAnag(null);
clavRow.setDataDoc(null);
clavRow.setSerDoc(null);
clavRow.setGestione(null);
clavRow.setDataReg(null);
clavRow.setNumDoc(null);
clavRow.setValUnt(null);
clav.getDtbDocr().add(clavRow);
DtbDoct slav = generateScarichiArticoloDaCarico(codDtipSlav, clav, row);
slav.setActivityId(activity.getActivityId());
docsToPersist.add(slav);
if (doc.getDtbDocr() != null) {
for (DtbDocr row : doc.getDtbDocr()) {
DtbDocr clavRow = (DtbDocr) row.clone();
clavRow.setOperation(OperationType.INSERT);
clavRow.setCodDtip(null);
clavRow.setCodAnag(null);
clavRow.setDataDoc(null);
clavRow.setSerDoc(null);
clavRow.setGestione(null);
clavRow.setDataReg(null);
clavRow.setNumDoc(null);
clavRow.setValUnt(null);
clav.getDtbDocr().add(clavRow);
DtbDoct slav = generateScarichiArticoloDaCarico(codDtipSlav, clav, row);
slav.setActivityId(activity.getActivityId());
docsToPersist.add(slav);
}
}
}
entityProcessor.processEntityList(docsToPersist, true);
}
@@ -3657,7 +3660,8 @@ public class DocumentProdService {
" AND num_doc = " + UtilityDB.valueToString(doct.getNumDoc()) +
" AND ser_doc = " + UtilityDB.valueToString(doct.getSerDoc()) +
" AND cod_dtip = " + UtilityDB.valueToString(doct.getCodDtip()) +
" AND cod_anag = " + UtilityDB.valueToString(doct.getCodAnag());
" AND cod_anag = " + UtilityDB.valueToString(doct.getCodAnag()) +
" AND cod_mart is not null ";
return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbDocr.class);