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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-01-23 12:27:35 +01:00
parent 277f0df42b 7da6c77400
commit 3fdfbb432c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-engine/src/main/java/it/integry/ems/logistic/service/DistribuzioneColliService.java
View File

@@ -145,11 +145,13 @@ public class DistribuzioneColliService {
whereCondOrd = jsonNode.get("whereCond").asText();
}
if (whereCondOrd != null) {
whereCondOrd = whereCondOrd
.replaceAll("d\\.g", "dtb_ordt.gestione")
.replaceAll("d\\.d", "dtb_ordt.data_ord")
.replaceAll("d\\.n", "dtb_ordt.num_ord")
.replaceAll("dr\\.dc", "dtb_ordr.data_cons");
}
} else {
StringBuffer xmlFilter = new StringBuffer();
StringBuffer xmlParameter = new StringBuffer();
@@ -243,6 +245,8 @@ public class DistribuzioneColliService {
" WHERE " + whereCondOrd;
List<DtbOrdt> orderTestate = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), dtbOrdrSql, DtbOrdt.class, 30);
if (orderTestate == null) orderTestate = new ArrayList<>();
List<DtbOrdr> orderRows = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), dtbOrdrSql, DtbOrdr.class, 30);
if (orderRows == null) orderRows = new ArrayList<>();