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-09-29 10:13:05 +02:00
parent 7dff05df5c ab764a9a50
commit eecadba27d
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,10 +14,7 @@ import it.integry.ems_model.entity.*;
import it.integry.ems_model.entity.common.DtbBaseDocT;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityBigDecimal;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityLocalDate;
import it.integry.ems_model.utility.UtilityString;
import it.integry.ems_model.utility.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@@ -224,22 +221,30 @@ public class PvmAccettazioneService {
}
}
if ("S".equals(accettazioneDTO.getEvadiOrdine()) && !accettazioneDTO.getOrdine().isEmpty()) {
List<DtbOrdt> ordini =
Stream
.of(accettazioneDTO.getOrdine())
.map(
x -> {
DtbOrdt dtbOrdt = new DtbOrdt()
.setDataOrd(x.getDataOrd())
.setNumOrd(x.getNumOrd())
.setGestione(gestione)
.setFlagEvasoForzato("S")
.setModificatoDa("EVASIONE DA ACCETTAZIONE");
dtbOrdt.setOperation(OperationType.UPDATE);
return dtbOrdt;
}
).toList();
if ("S".equals(accettazioneDTO.getEvadiOrdine())) {
String sql =
Query.format(
"SELECT DISTINCT dtb_ordt.gestione, dtb_ordt.data_ord, dtb_ordt.num_ord\n" +
"FROM dtb_ordt\n" +
" INNER JOIN dtb_ordr ON dtb_ordt.gestione = dtb_ordr.gestione\n" +
" AND dtb_ordt.data_ord = dtb_ordr.data_ord\n" +
" AND dtb_ordt.num_ord = dtb_ordr.num_ord\n" +
"WHERE dtb_ordt.cod_mdep = %S\n" +
" AND dtb_ordt.cod_anag = %s\n" +
" AND dtb_ordt.flag_evaso_forzato = 'N'\n" +
" AND dtb_ordr.data_cons BETWEEN DATEADD(WEEK, -1, %s) AND %s",
codMdep, accettazioneDTO.getDocumento().getCodAnag(),
accettazioneDTO.getDocumento().getDataDoc(),
accettazioneDTO.getDocumento().getDataDoc());
List<DtbOrdt> ordini = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbOrdt.class);
ordini.stream().forEach(x -> {
x.setFlagEvasoForzato("S")
.setModificatoDa("EVASIONE DA ACCETTAZIONE");
x.setOperation(OperationType.UPDATE);
}
);
entityList.addAll(ordini);
}
@@ -457,9 +462,9 @@ public class PvmAccettazioneService {
// }
//
// } else {
righeNew.add(insertRowBolla(articolo, riga.getIdRiga(), null, riga.getQtaDoc(), riga.getValUnt()));
riga.setQtaDoc(BigDecimal.ZERO);
// }
righeNew.add(insertRowBolla(articolo, riga.getIdRiga(), null, riga.getQtaDoc(), riga.getValUnt()));
riga.setQtaDoc(BigDecimal.ZERO);
// }
} while (riga.getQtaDoc().doubleValue() > 0);
}