Merge branch 'master' into develop

ems-engine/src/main/java/it/integry/ems/product/dto/DuplicaListinoDTO.java

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

ems-engine/src/main/java/it/integry/ems/product/service/ListiniVenditaServices.java

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