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-18 11:03:18 +02:00
parent 61d03a9ece a1013c878a
commit 7ce4703235
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

@@ -369,7 +369,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
String existHeader = setup.get("EXIST_HEADER");
boolean importPrezzoNetto = UtilityHashMap.getValueIfExists(setup, "PREZZO_NETTO", "S").equalsIgnoreCase("S");
boolean setPercPremio = UtilityHashMap.getValueIfExists(setup, "SET_PERC_PREMIO", "S").equalsIgnoreCase("S");
String valPremioString = UtilityHashMap.getValueIfExists(setup, "VAL_PREMIO");
String percPremio = UtilityHashMap.getValueIfExists(setup, "PERC_PREMIO");
BigDecimal percMaggPrzBase = BigDecimal.ZERO;
if (!UtilityString.isNullOrEmpty(setup.get("PERC_MAGG_PRZ_BASE"))) {
percMaggPrzBase = new BigDecimal(setup.get("PERC_MAGG_PRZ_BASE"));
@@ -567,7 +567,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
String columnPercPremio = "CAST(0 AS NUMERIC)";
if (!importPrezzoNetto)
if (setPercPremio)
columnPercPremio = "case when premi.cod_art_for IS not null AND premi.prz_acq_netto <> 0 then " + valPremioString +" ELSE 0 END ";
columnPercPremio = "case when premi.cod_art_for IS not null AND premi.prz_acq_netto <> 0 then " + percPremio +" ELSE 0 END ";
else
columnValPremio = "case when premi.cod_art_for IS not null AND premi.prz_acq_netto <> 0 then [COLUMN_PRZ_ACQ] - premi.prz_acq_netto ELSE 0 END ";