From ea8d8835cd91b2df852e8b1d0fdd4cf08ec1cb1d Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 27 Nov 2020 11:09:53 +0100 Subject: [PATCH 1/2] Sostituita query load doc rows con vista --- .../rest/PickingResiRESTConsumer.java | 142 +----------------- 1 file changed, 6 insertions(+), 136 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java index 2bb933f6..b230235c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java @@ -37,148 +37,18 @@ public class PickingResiRESTConsumer { for(int i = 0; i < documents.size(); i++) { HashMap filter = new HashMap<>(); - filter.put("dtb_docr.data_doc", documents.get(i).getDataDocD()); - filter.put("dtb_docr.num_doc", documents.get(i).getNumDoc()); - filter.put("dtb_docr.ser_doc", documents.get(i).getSerDoc()); - filter.put("dtb_docr.cod_anag", documents.get(i).getCodAnag()); - filter.put("dtb_docr.cod_dtip", documents.get(i).getCodDtip()); + filter.put("data_doc", documents.get(i).getDataDocD()); + filter.put("num_doc", documents.get(i).getNumDoc()); + filter.put("ser_doc", documents.get(i).getSerDoc()); + filter.put("cod_anag", documents.get(i).getCodAnag()); + filter.put("cod_dtip", documents.get(i).getCodDtip()); filterCond.add(filter); } - String sql = "SELECT dtb_docr.[cod_anag]" + - " ,dtb_docr.[cod_dtip]" + - " ,dtb_docr.[data_doc]" + - " ,dtb_docr.[ser_doc]" + - " ,dtb_docr.[num_doc]" + - " ,dtb_docr.[id_riga]" + - " ,dtb_docr.[cod_mart]" + - " ,dtb_docr.[descrizione]" + - " ,dtb_docr.[unt_doc]" + - " ,(dtb_docr.[rap_conv] / dtb_docr.[rap_conv]) as rap_conv" + - " ,(dtb_docr.[qta_doc] * dtb_docr.[rap_conv]) - ISNULL(mtb_colr.qta_col, 0) as qta_doc" + - " ,dtb_docr.[val_unt]" + - " ,dtb_docr.[sconto5]" + - " ,dtb_docr.[sconto6]" + - " ,dtb_docr.[sconto7]" + - " ,dtb_docr.[sconto8]" + - " ,dtb_docr.[cod_aliq]" + - " ,dtb_docr.[perc_prov]" + - " ,dtb_docr.[val_prov]" + - " ,dtb_docr.[data_ord]" + - " ,dtb_docr.[num_ord]" + - " ,dtb_docr.[riga_ord]" + - " ,dtb_docr.[importo_riga]" + - " ,dtb_docr.[cod_col]" + - " ,dtb_docr.[cod_tagl]" + - " ,dtb_docr.[cod_jcom]" + - " ,dtb_docr.[cod_mdep]" + - " ,dtb_docr.[perc_gest]" + - " ,dtb_docr.[val_gest]" + - " ,dtb_docr.[partita_mag]" + - " ,dtb_docr.[val_unt_iva]" + - " ,dtb_docr.[qta_cnf]" + - " ,dtb_docr.[descrizione_estesa]" + - " ,dtb_docr.[costo_unt]" + - " ,dtb_docr.[perc_ispe]" + - " ,dtb_docr.[val_ispe]" + - " ,dtb_docr.[perc_promo]" + - " ,dtb_docr.[val_promo]" + - " ,dtb_docr.[perc_oneri]" + - " ,dtb_docr.[val_oneri]" + - " ,dtb_docr.[flag_evaso_forzato]" + - " ,dtb_docr.[cod_dtip_comp]" + - " ,dtb_docr.[data_doc_comp]" + - " ,dtb_docr.[ser_doc_comp]" + - " ,dtb_docr.[num_doc_comp]" + - " ,dtb_docr.[cod_promo]" + - " ,dtb_docr.[perc_prov2]" + - " ,dtb_docr.[val_prov2]" + - " ,dtb_docr.[cod_art_for]" + - " ,dtb_docr.[unt_doc2]" + - " ,dtb_docr.[qta_doc2]" + - " ,dtb_docr.[unt_doc3]" + - " ,dtb_docr.[qta_doc3]" + - " ,dtb_docr.[num_cnf] - ISNULL(mtb_colr.num_cnf, 0) AS num_cnf" + - " ,dtb_docr.[peso_lordo]" + - " ,dtb_docr.[posizione]" + - " ,dtb_docr.[cod_anag_comp]" + - " ,dtb_docr.[cod_mtip]" + - " ,dtb_docr.[matricola]" + - " ,dtb_docr.[data_iniz_comp]" + - " ,dtb_docr.[data_fine_comp]" + - " ,dtb_docr.[cod_kit]" + - " ,dtb_docr.[cod_alis]" + - " ,dtb_docr.[data_ins_row]" + - " ,dtb_docr.[note] " + - " ,dtb_doct.[gestione] " + - " ,mtb_partita_mag.[data_scad] as data_scad_partita_mag " + - "FROM dtb_docr " + - "INNER JOIN dtb_doct ON dtb_docr.num_doc = dtb_doct.num_doc AND dtb_docr.data_doc = dtb_doct.data_doc AND dtb_docr.cod_anag = dtb_doct.cod_anag AND dtb_docr.cod_dtip = dtb_doct.cod_dtip AND dtb_docr.ser_doc = dtb_doct.ser_doc " + - "INNER JOIN mtb_aart ON dtb_docr.cod_mart = mtb_aart.cod_mart " + - "LEFT OUTER JOIN mtb_partita_mag ON dtb_docr.cod_mart = mtb_partita_mag.cod_mart " + - " AND dtb_docr.partita_mag = mtb_partita_mag.partita_mag " + - "LEFT OUTER JOIN ctb_cont ON mtb_aart.cod_ccon_ricavi = ctb_cont.cod_ccon " + - "LEFT OUTER JOIN ctb_grup ON ctb_cont.cod_cgrp = ctb_grup.cod_cgrp " + - "LEFT OUTER JOIN (" + - " SELECT gestione," + - " cod_mart," + - " cod_col," + - " cod_tagl," + - " SUM(qta_col) as qta_col," + - " data_ord," + - " num_ord," + - " riga_ord," + - " partita_mag," + - " qta_cnf," + - " gestione_rif," + - " data_collo_rif," + - " ser_collo_rif," + - " num_collo_rif," + - " cod_jcom," + - " SUM(num_cnf) as num_cnf," + - " cod_anag_doc," + - " cod_dtip_doc," + - " data_doc," + - " ser_doc," + - " num_doc," + - " id_riga_doc" + - " FROM mtb_colr" + - " GROUP BY gestione," + - " cod_barre," + - " cod_mart," + - " cod_col," + - " cod_tagl," + - " data_ord," + - " num_ord," + - " riga_ord," + - " partita_mag," + - " qta_cnf," + - " gestione_rif," + - " data_collo_rif," + - " ser_collo_rif," + - " num_collo_rif," + - " cod_jcom," + - " cod_anag_doc," + - " cod_dtip_doc," + - " data_doc," + - " ser_doc," + - " num_doc," + - " id_riga_doc" + - " ) mtb_colr" + - " ON " + - " dtb_docr.cod_anag = mtb_colr.cod_anag_doc AND " + - " dtb_docr.cod_dtip = mtb_colr.cod_dtip_doc AND " + - " dtb_docr.ser_doc = mtb_colr.ser_doc AND " + - " dtb_docr.data_doc = mtb_colr.data_doc AND " + - " dtb_docr.num_doc = mtb_colr.num_doc AND " + - " dtb_docr.id_riga = mtb_colr.id_riga_doc " + + String sql = "SELECT * FROM dvw_situazione_qta_docs " + "WHERE " + - " (ctb_grup.sezione <> 1 OR ctb_grup.sezione IS NULL) AND " + - " dtb_docr.[qta_doc] - ISNULL(mtb_colr.qta_col, 0) > 0 AND" + - " ( " + UtilityQuery.concatFieldListInWhereCond(filterCond) + - " ) " + "ORDER BY cod_mart"; From 4f02c3a4bcfa6bf54419444d3794cc51965e4c48 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 27 Nov 2020 11:11:09 +0100 Subject: [PATCH 2/2] -> v1.13.26 (172) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e905037..8d8e92ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 171 - def appVersionName = '1.13.25' + def appVersionCode = 172 + def appVersionName = '1.13.26' signingConfigs { release {