Corretta duplicazione listino di vendita, prima usava solo l'ultima versione

This commit is contained in:
2025-10-21 10:02:14 +02:00
parent 05857e2b11
commit 0d93dd2b1c
2 changed files with 17 additions and 7 deletions

View File

@@ -2,6 +2,7 @@ package it.integry.ems.product.dto;
import it.integry.ems_model.entity.VtbListData; import it.integry.ems_model.entity.VtbListData;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
public class DuplicaListinoDTO { public class DuplicaListinoDTO {
@@ -10,6 +11,7 @@ public class DuplicaListinoDTO {
private Date newDataIniz; private Date newDataIniz;
private String newCodDivi; private String newCodDivi;
private VtbListData listino; private VtbListData listino;
private LocalDate dataValidita;
public String getNewCodVlis() { public String getNewCodVlis() {
return newCodVlis; return newCodVlis;
@@ -55,4 +57,13 @@ public class DuplicaListinoDTO {
this.listino = listino; this.listino = listino;
return this; return this;
} }
public LocalDate getDataValidita() {
return dataValidita;
}
public DuplicaListinoDTO setDataValidita(LocalDate dataValidita) {
this.dataValidita = dataValidita;
return this;
}
} }

View File

@@ -711,13 +711,11 @@ public class ListiniVenditaServices {
// Clonazione MtbLisvData // Clonazione MtbLisvData
sql = Query.format( sql = Query.format(
"SELECT mtb_lisv_data.*, add_ric_spese, add_val_spese, add_sco_spese, flag_primario\n" + "SELECT *\n" +
"FROM mtb_lisv_data\n" + "FROM getListinoVendita(%s, %s, NULL)\n" +
" LEFT OUTER JOIN mtb_lisv ml ON mtb_lisv_data.cod_mart = ml.cod_mart AND mtb_lisv_data.cod_vlis = ml.cod_vlis\n" + "WHERE tipo_variazione <> 'D'",
"WHERE mtb_lisv_data.cod_vlis = %s\n" + listinoOriginale.getDataIniz(),
" AND versione = %s", listinoOriginale.getCodVlis()
listinoOriginale.getCodVlis(),
listinoOriginale.getVersione()
); );
List<MtbLisvData> mtbLisvDataList = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbLisvData.class); List<MtbLisvData> mtbLisvDataList = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbLisvData.class);
@@ -726,6 +724,7 @@ public class ListiniVenditaServices {
for (MtbLisvData mtbLisvData : mtbLisvDataList) { for (MtbLisvData mtbLisvData : mtbLisvDataList) {
mtbLisvData.setCodVlis(listinoNuovo.getCodVlis()); mtbLisvData.setCodVlis(listinoNuovo.getCodVlis());
mtbLisvData.setVersione(null); mtbLisvData.setVersione(null);
mtbLisvData.setTipoVariazione("I");
mtbLisvData.setOperation(OperationType.INSERT); mtbLisvData.setOperation(OperationType.INSERT);
} }