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

Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Anthony Santoro
2025-10-21 10:03:08 +02:00
parent ab70242ebf fe0927c0eb
commit c6c4f52e93
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

9
ems-engine/src/main/java/it/integry/ems/product/export/ArticoliExporter.java
View File

@@ -2,6 +2,7 @@ package it.integry.ems.product.export;
import it.integry.ems.export.base.BaseEntityExporter;
import it.integry.ems.export.base.EntityExportResponse;
import it.integry.ems.export.base.ExportFromQuery;
import it.integry.ems.export.base.IEntityExporter;
import it.integry.ems.product.export.services.*;
import org.springframework.web.context.ContextLoader;
@@ -34,6 +35,10 @@ public class ArticoliExporter extends BaseEntityExporter implements IEntityExpor
case SLIM2K:
Slim2kService slim2kService = context.getBean(Slim2kService.class);
return slim2kService.export(type, format);
case EXCEL:
case CSV:
ExportFromQuery expq = ContextLoader.getCurrentWebApplicationContext().getBean(ExportFromQuery.class);
return expq.export(username, type, format, whereCond);
default:
throw new Exception(String.format("Formato %s non supportato", format));
}
@@ -49,7 +54,9 @@ public class ArticoliExporter extends BaseEntityExporter implements IEntityExpor
WBC_STOCK_LIST("GET_STOCK_LIST"),
YOCABE("YOCABE"),
SLIM2K("SLIM2K"),
WOOCOMMERCE_STOCK("WOOCOMMERCE_STOCK");
WOOCOMMERCE_STOCK("WOOCOMMERCE_STOCK"),
EXCEL("EXCEL"),
CSV("CSV");
private String text;

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

@@ -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);
}