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

Fix su controllo getCodMdep

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-09-03 12:21:33 +02:00
parent 1bdb592755
commit 079854109f
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
View File

@@ -767,14 +767,15 @@ public class PvmService {
String filtroArticoli = setupGest.getSetup(conn, "PVM", "DOC_INTERNI", "FILTRO_ARTICOLI");
String campoFiltro = setupGest.getSetup(conn, "PVM", "DOC_INTERNI", "CAMPO_FILTRO_ARTICOLI");
if (!UtilityString.isNullOrEmpty(filtroArticoli)) {
ObjectMapper objectMapper = new ObjectMapper();
TypeReference<List<FiltroArtDTO>> mapType = new TypeReference<List<FiltroArtDTO>>() {
};
filtroDTO = objectMapper.readValue(filtroArticoli, mapType);
final Optional<FiltroArtDTO> filtro = Stream.of(filtroDTO)
filtroDTO = jsonObjectMapper.readValue(filtroArticoli, mapType);
final java.util.Optional<FiltroArtDTO> filtro = filtroDTO.stream()
.filter(filtroArtDTO -> filtroArtDTO.getCodDtip().equalsIgnoreCase(codDtip) &&
filtroArtDTO.getCodMdep() == null || filtroArtDTO.getCodMdep().equalsIgnoreCase(codMdep))
(filtroArtDTO.getCodMdep() == null || filtroArtDTO.getCodMdep().equalsIgnoreCase(codMdep)))
.findFirst();
if (filtro.isPresent()) {
whereCondArticoli = filtro.get().getWhereCond();
}
@@ -2906,7 +2907,7 @@ public class PvmService {
} else if ("L".equalsIgnoreCase(gestione) && docFromPickingDTO.getColli().size() == 1 && isDocNote(whereCondColli)) {
//Salviamo solo la data documento
query = "SELECT gestione, data_collo , ser_collo , num_collo , Cast(getDate() as date) as data_doc, cod_dtip_provv as cod_dtip FROM mtb_colt ";
query = "SELECT gestione, data_collo , ser_collo , num_collo , CAST(getDate() AS DATE) AS data_doc, cod_dtip_provv AS cod_dtip FROM mtb_colt ";
query = UtilityDB.addwhereCond(query, whereCondColli, false);
MtbColt collo = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), query, MtbColt.class);
@@ -2968,12 +2969,12 @@ public class PvmService {
" mtb_colt.data_ord, " +
" mtb_colt.num_ord, " +
" mtb_colt.gestione + '|' + " +
" case when mtb_colt.gestione = 'L' THEN '' ELSE mtb_colt.cod_anag END + '|' + " +
" case when mtb_colt.gestione = 'L' THEN '' ELSE IsNull(mtb_colt.cod_vdes,'') END + '|' + " +
" case when mtb_colt.gestione = 'L' THEN '' ELSE IsNull(dtb_ordt.listino,'') END + '|' + " +
" mtb_colt.cod_mdep as gruppo, " +
" CASE WHEN mtb_colt.gestione = 'L' THEN '' ELSE mtb_colt.cod_anag END + '|' + " +
" CASE WHEN mtb_colt.gestione = 'L' THEN '' ELSE IsNull(mtb_colt.cod_vdes,'') END + '|' + " +
" CASE WHEN mtb_colt.gestione = 'L' THEN '' ELSE IsNull(dtb_ordt.listino,'') END + '|' + " +
" mtb_colt.cod_mdep AS gruppo, " +
" vtb_clie.cod_dtip_sped, " +
" Round(sum(qta_col), 3) as tot_qta " +
" Round(SUM(qta_col), 3) AS tot_qta " +
" FROM mtb_colt INNER JOIN mtb_colr ON mtb_colt.gestione = mtb_colr.gestione AND " +
" mtb_colt.data_collo = mtb_colr.data_collo AND " +
" mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
@@ -2993,9 +2994,9 @@ public class PvmService {
" mtb_colt.num_ord, " +
" vtb_clie.cod_dtip_sped, " +
" mtb_colt.gestione + '|' + " +
" case when mtb_colt.gestione = 'L' THEN '' ELSE mtb_colt.cod_anag END + '|' + " +
" case when mtb_colt.gestione = 'L' THEN '' ELSE IsNull(mtb_colt.cod_vdes,'') END + '|' + " +
" case when mtb_colt.gestione = 'L' THEN '' ELSE IsNull(dtb_ordt.listino,'') END + '|' + " +
" CASE WHEN mtb_colt.gestione = 'L' THEN '' ELSE mtb_colt.cod_anag END + '|' + " +
" CASE WHEN mtb_colt.gestione = 'L' THEN '' ELSE IsNull(mtb_colt.cod_vdes,'') END + '|' + " +
" CASE WHEN mtb_colt.gestione = 'L' THEN '' ELSE IsNull(dtb_ordt.listino,'') END + '|' + " +
" mtb_colt.cod_mdep " +
"ORDER BY mtb_colt.gestione, mtb_colt.cod_anag, mtb_colt.cod_vdes, mtb_colt.cod_mdep, mtb_colt.data_collo, mtb_colt.num_collo ";
query = UtilityDB.addwhereCond(query, whereCondColli, false);
@@ -3197,12 +3198,12 @@ public class PvmService {
query =
"SELECT wtb_users.user_name, wtb_users.password, wtb_users_info.format_file, COUNT(wtb_users_info.format_file) over (partition by wtb_users_info.user_name) as count_export" +
" FROM wtb_users " +
" FROM wtb_users " +
"INNER JOIN wtb_users_info ON wtb_users.User_name = wtb_users_info.user_name " +
"LEFT OUTER JOIN wtb_clie ON wtb_users.User_name = wtb_clie.user_name AND wtb_users_info.export_type = 'DOCUMENTI VENDITA' " +
"LEFT OUTER JOIN wtb_forn ON wtb_users.User_name = wtb_forn.user_name AND wtb_users_info.export_type <> 'DOCUMENTI VENDITA'" +
" WHERE wtb_users_info.flag_state = 'S' and " +
" wtb_users_info.export_type = " + UtilityDB.valueToString(exportType);
" WHERE wtb_users_info.flag_state = 'S' and " +
" wtb_users_info.export_type = " + UtilityDB.valueToString(exportType);
query = UtilityDB.addwhereCond(query, whereCondAnag, true);
HashMap<String, Object> datiExport = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), query);