From ef73fe9e90888f661c6f67d7fa93fbc0c3d7376b Mon Sep 17 00:00:00 2001 From: ValerioC Date: Mon, 17 Aug 2020 17:12:15 +0200 Subject: [PATCH 1/7] Inserito controllo messaggio errore in recupero colli in caso di mtb_colt non esistente --- .../it/integry/integrywmsnative/gest/main/MainFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 7d091cf9..37d486a1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -161,7 +161,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab cyclicRecover(sessionsIterator, onComplete, onFailed); }, ex -> { - if(ex.getMessage().contains("Dati collo non corretti") || (ex.getMessage().contains("Il collo numero") && ex.getMessage().contains("non esiste"))) { + if(ex.getMessage().contains("Dati entity mtb_colt non trovati") || ex.getMessage().contains("Dati collo non corretti") || (ex.getMessage().contains("Il collo numero") && ex.getMessage().contains("non esiste"))) { ColliDataRecover.closeSession(recoveredMtbColtID); onFailed.run(ex); } else { From 89ae99358f6c754fcb048f49866b57a3178c6b8a Mon Sep 17 00:00:00 2001 From: ValerioC Date: Mon, 17 Aug 2020 17:14:28 +0200 Subject: [PATCH 2/7] -> 1.12.16 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index db517032..4381de70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 144 - def appVersionName = '1.12.15' + def appVersionCode = 145 + def appVersionName = '1.12.16' signingConfigs { release { From 8492b09db15efbeadfdf27f39896ab4db8b279e4 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 18 Aug 2020 11:49:03 +0200 Subject: [PATCH 3/7] aggiunto controllo errore recupero sull'update della data fine collo --- .../integrywmsnative/gest/main/MainFragment.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 37d486a1..3e7ae338 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -170,7 +170,17 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab cyclicRecover(sessionsIterator, onComplete, onFailed); }); - }, onFailed); + }, ex -> { + + if(ex.getMessage().contains("Dati entity mtb_colt non trovati") || ex.getMessage().contains("Dati collo non corretti") || (ex.getMessage().contains("Il collo numero") && ex.getMessage().contains("non esiste"))) { + ColliDataRecover.closeSession(recoveredMtbColtID); + onFailed.run(ex); + } else { + onFailed.run(ex); + } + + cyclicRecover(sessionsIterator, onComplete, onFailed); + }); } else { ColliDataRecover.closeSession(recoveredMtbColtID); cyclicRecover(sessionsIterator, onComplete, onFailed); From 08d233b84ed894c6b87306e56e9b2942e7f1a9af Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 18 Aug 2020 11:49:57 +0200 Subject: [PATCH 4/7] -> v1.12.17 (146) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4381de70..39498dec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 145 - def appVersionName = '1.12.16' + def appVersionCode = 146 + def appVersionName = '1.12.17' signingConfigs { release { From 81bacbd1e01018a421a5c12931e8f22a278ad335 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Fri, 4 Sep 2020 12:34:50 +0200 Subject: [PATCH 5/7] Modificata query fetch ultimi colli versati in recupero colli --- .../core/ProdRecuperoMaterialeHelper.java | 214 ++++++++++++------ 1 file changed, 143 insertions(+), 71 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java index 8831f2ee..716aa44b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java @@ -30,78 +30,150 @@ public class ProdRecuperoMaterialeHelper { public void loadLastULVersate(RunnableArgs> onComplete, RunnableArgs onFailed) { - - String sql = "SELECT jtb_fasi.cod_jfas, " + - " jtb_fasi.descrizione AS descrizione_fase, " + - " mtb_colr.gestione, " + - " mtb_colr.data_collo, " + - " mtb_colr.num_collo, " + - " mtb_colr.ser_collo, " + - " mtb_colr.cod_mart, " + - " mtb_colr.cod_col, " + - " mtb_colr.cod_tagl, " + - " SUM(mtb_colr.qta_col) AS qta_col, " + - " SUM(mtb_colr.num_cnf) AS num_cnf, " + - " mtb_colr.ser_collo, " + - " mtb_colr.partita_mag, " + - " mtb_colr.cod_jcom, " + - " mtb_colr.num_collo_rif, " + - " mtb_colr.data_collo_rif, " + - " mtb_colr.ser_collo_rif, " + - " mtb_colr.gestione_rif, " + - " mtb_colt.segno, " + - " ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_art, " + - " mtb_aart.unt_mis, " + - " MAX(datetime_row) AS datetime_row, " + - " dtb_ord_steps.num_ord, " + - " dtb_ord_steps.data_ord, " + - " dtb_ord_steps.gestione as gestione_ord, " + - " dtb_ord_steps.hr_num as hr, " + - " mtb_colr.riga_ord, " + - " CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, 0)) as percentage_hr " + - "FROM mtb_colr " + - "INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " + - "AND mtb_colr.data_collo = mtb_colt.data_collo " + - "AND mtb_colr.ser_collo = mtb_colt.ser_collo " + - "AND mtb_colr.gestione = mtb_colt.gestione " + + + String sql = "WITH ul_list AS ( " + + " SELECT jtb_fasi.cod_jfas, " + + " jtb_fasi.descrizione AS descrizione_fase, " + + " mtb_colr.gestione, " + + " mtb_colr.data_collo, " + + " mtb_colr.num_collo, " + + " mtb_colr.ser_collo, " + + " mtb_colr.cod_mart, " + + " mtb_colr.cod_col, " + + " mtb_colr.cod_tagl, " + + " SUM(mtb_colr.qta_col) AS qta_col, " + + " SUM(mtb_colr.num_cnf) AS num_cnf, " + + " mtb_colr.partita_mag, " + + " mtb_colr.cod_jcom, " + + " mtb_colr.num_collo_rif, " + + " mtb_colr.data_collo_rif, " + + " mtb_colr.ser_collo_rif, " + + " mtb_colr.gestione_rif, " + + " mtb_colt.segno, " + + " ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_art, " + + " mtb_aart.unt_mis, " + + " MAX(datetime_row) AS datetime_row, " + + " dtb_ord_steps.num_ord, " + + " dtb_ord_steps.data_ord, " + + " dtb_ord_steps.gestione as gestione_ord, " + + " dtb_ord_steps.hr_num as hr, " + + " mtb_colr.riga_ord, " + + " CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " + + " SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " + + " 0)) as percentage_hr " + + " FROM mtb_colr " + + " INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " + + " AND mtb_colr.data_collo = mtb_colt.data_collo " + + " AND mtb_colr.ser_collo = mtb_colt.ser_collo " + + " AND mtb_colr.gestione = mtb_colt.gestione " + + " INNER JOIN dtb_ord_steps ON dtb_ord_steps.data_ord = mtb_colr.data_ord " + + " AND dtb_ord_steps.gestione = mtb_colr.gestione " + + " AND dtb_ord_steps.num_ord = mtb_colr.num_ord " + + " AND dtb_ord_steps.data_iniz is not null " + + " AND dtb_ord_steps.data_fine is null " + + " INNER JOIN mtb_aart ON mtb_colr.cod_mart = mtb_aart.cod_mart " + + " LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " + + " WHERE jtb_fasi.cod_jfas IS NOT NULL " + + " AND segno = -1 " + + " AND mtb_colr.data_collo > DATEADD(DAY, -5, GETDATE()) " + + " GROUP BY jtb_fasi.cod_jfas, " + + " jtb_fasi.descrizione, " + + " mtb_colr.gestione, " + + " mtb_colr.data_collo, " + + " mtb_colr.num_collo, " + + " mtb_colr.ser_collo, " + + " mtb_colr.cod_mart, " + + " mtb_colr.cod_col, " + + " mtb_colr.cod_tagl, " + + " mtb_colr.ser_collo, " + + " mtb_colr.partita_mag, " + + " mtb_colr.cod_jcom, " + + " mtb_aart.descrizione_estesa, " + + " mtb_aart.descrizione, " + + " mtb_aart.unt_mis, " + + " mtb_colr.num_collo_rif, " + + " mtb_colr.data_collo_rif, " + + " mtb_colr.ser_collo_rif, " + + " mtb_colr.gestione_rif, " + + " mtb_colt.segno, " + + " dtb_ord_steps.num_ord, " + + " dtb_ord_steps.data_ord, " + + " dtb_ord_steps.gestione, " + + " mtb_colr.riga_ord, " + + " dtb_ord_steps.hr_num " + + " HAVING SUM(mtb_colr.qta_col) > 0 " + + "), max_ul AS ( " + + " SELECT " + + " cod_jfas, " + + " descrizione_fase, " + + " gestione, " + + " cod_mart, " + + " cod_col, " + + " cod_tagl, " + + " ser_collo, " + + " partita_mag, " + + " cod_jcom, " + + " descrizione_art, " + + " unt_mis, " + + " num_collo_rif, " + + " data_collo_rif, " + + " ser_collo_rif, " + + " gestione_rif, " + + " segno, " + + " num_ord, " + + " data_ord, " + + " gestione_ord, " + + " riga_ord, " + + " hr, " + + " MAX (datetime_row) as max_datetime_row " + + " FROM ul_list " + + " GROUP BY cod_jfas, " + + " descrizione_fase, " + + " gestione, " + + " cod_mart, " + + " cod_col, " + + " cod_tagl, " + + " ser_collo, " + + " partita_mag, " + + " cod_jcom, " + + " descrizione_art, " + + " unt_mis, " + + " num_collo_rif, " + + " data_collo_rif, " + + " ser_collo_rif, " + + " gestione_rif, " + + " segno, " + + " num_ord, " + + " data_ord, " + + " gestione_ord, " + + " riga_ord, " + + " hr " + + ") " + " " + - "INNER JOIN dtb_ord_steps ON dtb_ord_steps.data_ord = mtb_colr.data_ord " + - " AND dtb_ord_steps.gestione = mtb_colr.gestione " + - " AND dtb_ord_steps.num_ord = mtb_colr.num_ord " + - " AND dtb_ord_steps.data_iniz is not null " + - " AND dtb_ord_steps.data_fine is null " + - "INNER JOIN mtb_aart ON mtb_colr.cod_mart = mtb_aart.cod_mart " + - "LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " + - "WHERE jtb_fasi.cod_jfas IS NOT NULL " + - " AND segno = -1 " + - " AND mtb_colr.data_collo > DATEADD(DAY, -5, GETDATE()) " + - "GROUP BY jtb_fasi.cod_jfas, " + - " jtb_fasi.descrizione, " + - " mtb_colr.gestione, " + - " mtb_colr.data_collo, " + - " mtb_colr.num_collo, " + - " mtb_colr.ser_collo, " + - " mtb_colr.cod_mart, " + - " mtb_colr.cod_col, " + - " mtb_colr.cod_tagl, " + - " mtb_colr.ser_collo, " + - " mtb_colr.partita_mag, " + - " mtb_colr.cod_jcom, " + - " mtb_aart.descrizione_estesa, " + - " mtb_aart.descrizione, " + - " mtb_aart.unt_mis, " + - " mtb_colr.num_collo_rif, " + - " mtb_colr.data_collo_rif, " + - " mtb_colr.ser_collo_rif, " + - " mtb_colr.gestione_rif, " + - " mtb_colt.segno, " + - " dtb_ord_steps.num_ord, " + - " dtb_ord_steps.data_ord, " + - " dtb_ord_steps.gestione, " + - " mtb_colr.riga_ord, " + - " dtb_ord_steps.hr_num " + - "HAVING SUM(mtb_colr.qta_col) > 0 " + - "ORDER BY data_collo DESC"; + "SELECT qta_col, num_cnf, * FROM max_ul " + + "LEFT OUTER JOIN ul_list ON " + + " ISNULL(max_ul.cod_jfas, '') = ISNULL(ul_list.cod_jfas, '') AND " + + " ISNULL(max_ul.descrizione_fase, '') = ISNULL(ul_list.descrizione_fase, '') AND " + + " ISNULL(max_ul.gestione, '') = ISNULL(ul_list.gestione, '') AND " + + " ISNULL(max_ul.cod_mart, '') = ISNULL(ul_list.cod_mart, '') AND " + + " ISNULL(max_ul.cod_col, '') = ISNULL(ul_list.cod_col, '') AND " + + " ISNULL(max_ul.cod_tagl, '') = ISNULL(ul_list.cod_tagl, '') AND " + + " ISNULL(max_ul.ser_collo, '') = ISNULL(ul_list.ser_collo, '') AND " + + " ISNULL(max_ul.partita_mag, '') = ISNULL(ul_list.partita_mag, '') AND " + + " ISNULL(max_ul.cod_jcom, '') = ISNULL(ul_list.cod_jcom, '') AND " + + " ISNULL(max_ul.descrizione_art, '') = ISNULL(ul_list.descrizione_art, '') AND " + + " ISNULL(max_ul.unt_mis, '') = ISNULL(ul_list.unt_mis, '') AND " + + " ISNULL(max_ul.num_collo_rif, '') = ISNULL(ul_list.num_collo_rif, '') AND " + + " ISNULL(max_ul.data_collo_rif, '') = ISNULL(ul_list.data_collo_rif, '') AND " + + " ISNULL(max_ul.ser_collo_rif, '') = ISNULL(ul_list.ser_collo_rif, '') AND " + + " ISNULL(max_ul.gestione_rif, '') = ISNULL(ul_list.gestione_rif, '') AND " + + " ISNULL(max_ul.segno, '') = ISNULL(ul_list.segno, '') AND " + + " ISNULL(max_ul.num_ord, '') = ISNULL(ul_list.num_ord, '') AND " + + " ISNULL(max_ul.data_ord, '') = ISNULL(ul_list.data_ord, '') AND " + + " ISNULL(max_ul.gestione_ord, '') = ISNULL(ul_list.gestione_ord, '') AND " + + " ISNULL(max_ul.riga_ord, '') = ISNULL(ul_list.riga_ord, '') AND " + + " ISNULL(max_ul.hr, '') = ISNULL(ul_list.hr, '') AND " + + " max_ul.max_datetime_row = ul_list.datetime_row"; Type typeOfObjectsList = new TypeToken>() {}.getType(); SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback>() { From 759ca1ef24efbe91a6f2116e603eb9388a5521a9 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Fri, 4 Sep 2020 12:38:08 +0200 Subject: [PATCH 6/7] -> v1.12.18 (147) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 39498dec..5e355e5e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 146 - def appVersionName = '1.12.17' + def appVersionCode = 147 + def appVersionName = '1.12.18' signingConfigs { release { From 1e34fd884071776a84688972acc16afba4e3b2d7 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 22 Sep 2020 12:00:09 +0200 Subject: [PATCH 7/7] =?UTF-8?q?Aggiunta=20compatibilit=C3=A0=20con=20Honey?= =?UTF-8?q?well=20CT60?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 18 ++++++++++++++++++ app/build.gradle | 4 ++-- .../HoneyWellBarcodeReader.java | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ae78c113..db291c66 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,23 @@ + + + + diff --git a/app/build.gradle b/app/build.gradle index 5e355e5e..c29949de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 147 - def appVersionName = '1.12.18' + def appVersionCode = 148 + def appVersionName = '1.12.19' signingConfigs { release { diff --git a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java index fda391e6..61be9aea 100644 --- a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java +++ b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java @@ -45,6 +45,7 @@ public class HoneyWellBarcodeReader implements BarcodeReaderInterface { List compatibleModels = new ArrayList(); compatibleModels.add("EDA50"); compatibleModels.add("EDA51"); + compatibleModels.add("CT60"); if(compatibleModels.contains(model)) { return true;