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

In aggiunta cronologia delle raccolte in retrieveOrders di Agribook

Browse Source
This commit is contained in:
Marco Elefante
2024-04-19 15:47:04 +02:00
parent 869da4fa6c
commit 8eef4083c8
3 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java
View File

@@ -257,7 +257,6 @@ public class AgribookOrderService {
List<AgribookReportDTO> allReports = agribookReportService.retrieveReports(results, false);
for (AgribookOrderDTO agribookOrderDTO : results) {
//MtbDepo
Optional<MtbDepo> foundMtbDepo = Stream.of(mtbDepoList)
@@ -346,18 +345,6 @@ public class AgribookOrderService {
int lastPrevRaccQtaSett = lastReport.getPrevRaccQtaSett() == null ? 0 : lastReport.getPrevRaccQtaSett();
// int sumQtaSett = Stream.of(reportsGroup.getValue())
// .collect(Collectors.summingInt(AgribookReportDTO::getPrevRaccQtaSett));
// int sumQtaClassePremium = Stream.of(reportsGroup.getValue())
// .collect(Collectors.summingInt(agribookReportDTO -> agribookReportDTO.getPrevRaccQtaSett()
// * agribookReportDTO.getPrevRaccPercClassePremium() / 100));
// int sumQtaClasse1 = Stream.of(reportsGroup.getValue())
// .collect(Collectors.summingInt(agribookReportDTO -> agribookReportDTO.getPrevRaccQtaSett()
// * agribookReportDTO.getPrevRaccPercClasse1() / 100));
// int sumQtaClasse2 = Stream.of(reportsGroup.getValue())
// .collect(Collectors.summingInt(agribookReportDTO -> agribookReportDTO.getPrevRaccQtaSett()
// * agribookReportDTO.getPrevRaccPercClasse2() / 100));
int sumQtaClassePremium = lastPrevRaccQtaSett
* lastReport.getPrevRaccPercClassePremium() / 100;
int sumQtaClasse1 = lastPrevRaccQtaSett
@@ -376,12 +363,42 @@ public class AgribookOrderService {
.toList()
);
}
sql = Query.format(
"SELECT mtb_colr.data_collo AS 'data', SUM(mtb_colr.qta_col) AS 'qta', jtb_flav.nome AS 'squadra'\n" +
"FROM dtb_ordr\n" +
" INNER JOIN dtb_ordt ON dtb_ordr.gestione = dtb_ordt.gestione AND\n" +
" dtb_ordr.data_ord = dtb_ordt.data_ord AND\n" +
" dtb_ordr.num_ord = dtb_ordt.num_ord\n" +
" INNER JOIN gtb_anag ON dtb_ordt.cod_anag = gtb_anag.cod_anag\n" +
" INNER JOIN azienda ON azienda.part_iva <> gtb_anag.part_iva\n" +
" INNER JOIN mtb_colt ON mtb_colt.gestione = dtb_ordt.gestione AND\n" +
" mtb_colt.data_ord = dtb_ordt.data_ord AND\n" +
" mtb_colt.num_ord = dtb_ordt.num_ord\n" +
" INNER JOIN mtb_colr ON mtb_colt.gestione = mtb_colr.gestione AND\n" +
" mtb_colt.data_collo = mtb_colr.data_collo AND\n" +
" mtb_colt.ser_collo = mtb_colr.ser_collo AND\n" +
" mtb_colt.num_collo = mtb_colr.num_collo\n" +
" INNER JOIN jtb_lotr ON jtb_lotr.num_ord = dtb_ordr.num_ord\n" +
" INNER JOIN jtb_lott ON jtb_lott.id_lotto = jtb_lotr.id_lotto\n" +
" INNER JOIN jtb_flav ON jtb_lott.cod_jflav = jtb_flav.cod_jflav\n" +
"WHERE dtb_ordr.gestione = 'L'\n" +
" AND dtb_ordr.cod_mart = %s\n" +
" AND dtb_ordr.partita_mag = %s\n" +
" AND mtb_colt.segno = 1\n" +
" AND YEAR(dtb_ordr.data_ord) = %s\n" +
"GROUP BY mtb_colr.data_collo, jtb_flav.nome",
agribookOrderDTO.getCodMart(),
agribookOrderDTO.getPartitaMag(),
year);
agribookOrderDTO.setHarvestHistory(UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, HarvestHistoryDTO.class));
}
return results;
}
public void updatePercClassi(String codMart, String partitaMag, int newPercClasse1, int newPercClasse2, int newPercClassePremium) throws Exception {
Date dataRilevazione = new Date();

10
ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookOrderDTO.java
View File

@@ -71,6 +71,7 @@ public class AgribookOrderDTO extends ComposedEntityBase {
private AgribookDestinatarioDTO destinatario;
private MtbDepo mtbDepo;
private List<AgribookPrevRaccoltaDTO> previsioniRaccolta;
private List<HarvestHistoryDTO> harvestHistory;
private List<AgribookOrderAttachmentDTO> attachments;
@@ -358,4 +359,13 @@ public class AgribookOrderDTO extends ComposedEntityBase {
this.attachments = attachments;
return this;
}
public List<HarvestHistoryDTO> getHarvestHistory() {
return harvestHistory;
}
public AgribookOrderDTO setHarvestHistory(List<HarvestHistoryDTO> harvestHistory) {
this.harvestHistory = harvestHistory;
return this;
}
}

1
ems-engine/src/main/java/it/integry/ems/production/agribook/model/HarvestHistoryDTO.java
View File

@@ -11,6 +11,7 @@ public class HarvestHistoryDTO {
public LocalDate data;
@SqlField("qta")
public BigDecimal qta;
@SqlField("squadra")
public String squadra;
public LocalDate getData() {