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:
Mina Ruggiero
2025-02-25 13:00:00 +01:00
parent a75bf5ecfe 130a21bf25
commit 1e01a567a0
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportApuliaPromoService.java
View File

@@ -88,7 +88,13 @@ public class ImportApuliaPromoService {
" INNER JOIN mtb_lisa art ON mtb_lisa.cod_barre = art.cod_barre AND mtb_lisa.cod_alis = art.cod_alis\n" +
"WHERE mtb_lisa.cod_art_for = " + UtilityDB.valueToString(promozione.getCodArtForn()) + "\n" +
" AND mtb_lisa.cod_alis = " + UtilityDB.valueToString(codAlis) + "\n" +
" AND mtb_lisa.cod_barre is not null \n";
" AND mtb_lisa.cod_barre is not null \n" +
"SELECT art.cod_mart, art.cod_art_for\n" +
"FROM mtb_lisa\n" +
" INNER JOIN mtb_lisa art ON mtb_lisa.descr_art_forn = art.descr_art_forn AND mtb_lisa.cod_alis = art.cod_alis\n" +
"WHERE mtb_lisa.cod_art_for = " + UtilityDB.valueToString(promozione.getCodArtForn()) + "\n" +
" AND mtb_lisa.cod_alis = " + UtilityDB.valueToString(codAlis) + "\n" +
" AND mtb_lisa.descr_art_forn is not null \n";
List<MtbLisaData> mtbLisaData = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, MtbLisaData.class, OperationType.INSERT_OR_UPDATE);

3
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java
View File

@@ -362,7 +362,8 @@ public class PvmAccettazioneService {
if (dtbDoct instanceof WdtbDoct)
((WdtbDoct) dtbDoct)
.setDataInizTrasp(dataInizTrap)
.setOraInizTrasp(oraInizTrasp);
.setOraInizTrasp(oraInizTrasp)
.setDataReg(dataInizTrap);
}
private WdtbDocr insertRowBolla(AccettazioneDTO.Articoli articolo, Integer idRiga, String partitaMag, BigDecimal qtaDoc, BigDecimal valUnt) throws Exception {

2
ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java
View File

@@ -739,7 +739,7 @@ public class GiacenzaService {
" )\n" +
" )\n" +
" -- prendiamo i soli ordini del SECCO, sarà da modificare quando inizieranno ad ordinare anche altri (es. APULD)\n" +
" AND t.listino IN (" + UtilityDB.listValueToString(listini) + ")\n" +
( listini != null && !listini.isEmpty() ?" AND t.listino IN (" + UtilityDB.listValueToString(listini) + ")\n":"") +
" -- ordine non ancora evaso\n" +
" AND flag_evaso <> 'E'\n" +
" -- filtro solamente un Pdv\n" +