From 74cdd50f2b8950096c49fe28435e1e627bc453d4 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 11 Apr 2019 11:25:00 +0200 Subject: [PATCH 1/2] Migliorata gestione degli ordini di Lavorazione --- .../core/report/ReportManager.java | 7 ++++--- ...eAccettazioneInevasoRESTConsumerService.java | 17 +++++++++-------- ...oneOnOrdineAccettazioneInevasoViewModel.java | 16 ++++++++++------ .../viewmodel/ContenutoBancaleViewModel.java | 2 +- .../viewmodel/RettificaGiacenzeViewModel.java | 2 +- .../VenditaOrdineInevasoViewModel.java | 2 +- app/src/main/res/values-it/strings.xml | 12 ++++++------ app/src/main/res/values/strings.xml | 8 ++++---- 8 files changed, 36 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java b/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java index 64f152a8..407d4f89 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java @@ -7,14 +7,15 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; public class ReportManager { - public static void getRightReportNameByMtbColt(MtbColt mtbColt, RunnableArgs onComplete, RunnableArgs onFailed) { + public static void getRightReportNameByGestione(GestioneEnum gestione, RunnableArgs onComplete, RunnableArgs onFailed) { - if(mtbColt != null){ + if(gestione != null){ - GestioneEnum gestione = GestioneEnum.fromString(mtbColt.getGestione()); + //GestioneEnum gestione = GestioneEnum.fromString(mtbColt.getGestione()); switch (gestione) { case ACQUISTO: + case PRODUZIONE: onComplete.run("EtichettaBancale"); break; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java index fc5e31bf..62424a9f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java @@ -31,7 +31,8 @@ public class OrdineAccettazioneInevasoRESTConsumerService { String dateString = UtilityDate.formatDate(date, "yyyy/MM/dd"); if (!colliWhereCond.contains(x.gestione + " " + dateString + " " + x.numero)) { - colliWhereCond.add(x.gestione + " " + dateString + " " + x.numero); + String gestione = x.gestione.equalsIgnoreCase("P") ? "L" : x.gestione; + colliWhereCond.add(gestione + " " + dateString + " " + x.numero); } } catch (Exception ex){ UtilityLogger.errorMe(ex); @@ -49,14 +50,14 @@ public class OrdineAccettazioneInevasoRESTConsumerService { - String sql = "select distinct mtb_colt.* " + - "from mtb_colt, mtb_colr " + - "where mtb_colt.gestione = mtb_colr.gestione and " + - "mtb_colt.ser_collo = mtb_colr.ser_collo and " + - "mtb_colt.data_collo = mtb_colr.data_collo and " + + String sql = "SELECT DISTINCT mtb_colt.* " + + "FROM mtb_colt, mtb_colr " + + "WHERE mtb_colt.gestione = mtb_colr.gestione AND " + + "mtb_colt.ser_collo = mtb_colr.ser_collo AND " + + "mtb_colt.data_collo = mtb_colr.data_collo AND " + "mtb_colt.num_collo = mtb_colr.num_collo AND " + - "mtb_colt.gestione + ' ' + convert(varchar(15), mtb_colr.data_ord, 111) + ' ' + convert(varchar, mtb_colr.num_ord) IN (" + colliINCondition + - ") and mtb_colt.data_doc is null "; + "mtb_colt.gestione + ' ' + CONVERT(VARCHAR(15), mtb_colr.data_ord, 111) + ' ' + CONVERT(VARCHAR, mtb_colr.num_ord) IN (" + colliINCondition + + ") AND mtb_colt.data_doc IS NULL "; Type typeOfObjectsList = new TypeToken>() {}.getType(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java index 9d80746b..d78f72c2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java @@ -611,7 +611,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl try{ - ReportManager.getRightReportNameByMtbColt(currentMtbColt, reportName -> { + ReportManager.getRightReportNameByGestione(GestioneEnum.ACQUISTO, reportName -> { PrinterRESTConsumer.printCollo( value.get(0), @@ -796,16 +796,20 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting), mActivity.getText(R.string.loading) + " ...", true); + String gestioneRif = item.getGestioneOrdEnum() == GestioneEnum.PRODUZIONE ? "L" : item.getGestioneOrd(); + + final MtbColr mtbColr = new MtbColr() - .setCodMart(item.mtbAart.getCodMart()) + .setCodMart(item.getMtbAart().getCodMart()) .setPartitaMag(quantityDTO.batchLot.get()) .setDataScadPartita(quantityDTO.expireDate) .setQtaCol(quantityDTO.qtaTot.getBigDecimal()) - .setDescrizione(item.descrizioneEstesa) - .setNumOrd(item.numOrd) + .setDescrizione(item.getDescrizioneEstesa()) + .setNumOrd(item.getNumOrd()) .setDataOrd(item.getDataOrd()) - .setCodJcom(item.codJcom) - .setRigaOrd(item.rigaOrd); + .setGestioneRif(gestioneRif) + .setCodJcom(item.getCodJcom()) + .setRigaOrd(item.getRigaOrd()); mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index 807ffbac..bb5762b8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -107,7 +107,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked if(value.size() > 0) { try { - ReportManager.getRightReportNameByMtbColt(mtbColt.get(), reportName -> { + ReportManager.getRightReportNameByGestione(mtbColt.get().getGestioneEnum(), reportName -> { PrinterRESTConsumer.printCollo(value.get(0), mtbColt.get(), diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index 6a781998..1d5edd5b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -686,7 +686,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked if (value.size() > 0) { try { - ReportManager.getRightReportNameByMtbColt(mtbColt.get(), reportName -> { + ReportManager.getRightReportNameByGestione(mtbColt.get().getGestioneEnum(), reportName -> { PrinterRESTConsumer.printCollo(value.get(0), mtbColt.get(), diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index e4883d73..2222a00b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -913,7 +913,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } private void singlePrint(MtbColt mtbColtToPrint, String printerName, Runnable onComplete, RunnableArgs onAbort) { - ReportManager.getRightReportNameByMtbColt(mtbColtToPrint, reportName -> { + ReportManager.getRightReportNameByGestione(mtbColtToPrint.getGestioneEnum(), reportName -> { PrinterRESTConsumer.printCollo( printerName, diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a8e6d17a..6205587d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -60,16 +60,16 @@ articoli - articolo disponibile - articoli disponibili + articolo ordinato + articoli ordinati - - + + - %d ordine]]> - %d ordini]]> + %d ordine]]> + %d ordini]]> Chiudi UL Articoli presenti diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f09d945..192fbf0c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,16 +62,16 @@ items - available item - available items + ordered item + ordered items already registered LU already registered LUs - %d order loaded]]> - %d orders loaded]]> + %d order selected]]> + %d orders selected]]> Close LU Submitted items From 7eff4b8e3cde05c5925c5c8f62ba2561dda9672a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 11 Apr 2019 12:01:17 +0200 Subject: [PATCH 2/2] -> v1.0.44 (47) --- .idea/caches/build_file_checksums.ser | Bin 785 -> 785 bytes app/build.gradle | 4 ++-- .../layout/fragment_main_versamento_merce.xml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 3eba29cfdeb197f318d0c4a45197f40d1b3c4983..f6d4c915013bb8bc9dacdcadfdd9219fbbabf503 100644 GIT binary patch delta 37 vcmV+=0NVeN29XAkmj!AI!AAL!oa_(~`=1}Nrk`