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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-04-04 15:23:04 +02:00
parent b10cb1d551 cf4fc241ab
commit 7b65dce59e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoApuliaCarrefourService.java
View File

@@ -562,7 +562,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
String columnPrzAcq = "CAST(REPLACE(tabp.prz_acq, ',', '.') AS NUMERIC(20, 5)) ";
String columnValPremio = "CAST(0 AS NUMERIC)";
if (!importPrezzoNetto)
columnValPremio = "case when premi.cod_art_for IS not null then [COLUMN_PRZ_ACQ] - premi.prz_acq_netto ";
columnValPremio = "case when premi.cod_art_for IS not null then [COLUMN_PRZ_ACQ] - premi.prz_acq_netto ELSE 0 END ";
sql =
"INSERT INTO mtb_lisa_apulia_succ\n" +
@@ -651,7 +651,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
" WHEN [MAGG_PRZ] = 0 THEN 0\n" +
" ELSE [COLUMN_PRZ_ACQ] * (1 + [MAGG_PRZ] / 100) END AS prz_base_prop,\n" +
" CAST(0 AS NUMERIC) AS perc_premio,\n" +
" [COLUMN_VAL_PREMIO] ELSE 0 END AS val_premio\n" +
" [COLUMN_VAL_PREMIO] as val_premio\n" +
" FROM [TABLE_NAME] tabp\n" +
" INNER JOIN atb_list_apulia ON atb_list_apulia.linea = tabp.linea AND\n" +
" atb_list_apulia.part_iva_forn = tabp.partita_iva_forn AND\n" +