From f871c00f93312d009f4a094483d76055192b6be9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 6 Aug 2019 11:43:52 +0200 Subject: [PATCH] Implementati resi a fornitore --- .idea/caches/build_file_checksums.ser | Bin 964 -> 964 bytes app/build.gradle | 2 +- .../integrywmsnative/MainActivity.java | 8 +- .../consumers/BarcodeRESTConsumerService.java | 19 -- .../core/REST/model/SlackMessageDTO.java | 4 - .../configs/MenuConfiguration.java | 5 + .../core/context/AppContext.java | 4 - .../core/context/MainContext.java | 2 +- .../{REST => rest}/CommonRESTException.java | 10 +- .../core/{REST => rest}/HttpInterceptor.java | 3 +- .../core/{REST => rest}/RESTBuilder.java | 4 +- .../consumers/ArticoloRESTConsumer.java | 7 +- .../ArticoloRESTConsumerService.java | 6 +- .../consumers/BarcodeRESTConsumer.java | 10 +- .../consumers/BarcodeRESTConsumerService.java | 14 ++ .../consumers/ColliMagazzinoRESTConsumer.java | 10 +- .../ColliMagazzinoRESTConsumerService.java | 11 +- .../consumers/DepositoRESTConsumer.java | 2 +- .../consumers/EntityRESTConsumer.java | 10 +- .../consumers/EntityRESTConsumerService.java | 5 +- .../consumers/GestSetupRESTConsumer.java | 8 +- .../GestSetupRESTConsumerService.java | 9 +- .../consumers/ISimpleOperationCallback.java | 2 +- .../consumers/PosizioniRESTConsumer.java | 6 +- .../PosizioniRESTConsumerService.java | 4 +- .../consumers/PrinterRESTConsumer.java | 7 +- .../consumers/PrinterRESTConsumerService.java | 6 +- .../consumers/SystemRESTConsumer.java | 13 +- .../consumers/SystemRESTConsumerService.java | 10 +- .../consumers/_BaseRESTConsumer.java | 8 +- .../deserializer/DateDeserializer.java | 5 +- .../model/AvailableCodMdepsDTO.java | 2 +- .../model/DistribuzioneColloDTO.java | 2 +- .../rest/model/DocumentoResoDTO.java | 2 +- .../{REST => rest}/model/Ean128Model.java | 2 +- .../{REST => rest}/model/Ean13PesoModel.java | 2 +- .../core/{REST => rest}/model/EsitoType.java | 2 +- .../{REST => rest}/model/GestSetupDTO.java | 2 +- .../{REST => rest}/model/MailRequestDTO.java | 2 +- .../model/NativeSqlRequestDTO.java | 2 +- .../model/ServiceRESTResponse.java | 4 +- .../core/rest/model/SlackMessageDTO.java | 4 + .../watcher/ServerStatusChecker.java | 2 +- .../core/settings/DBSettingsModel.java | 5 +- .../core/settings/SettingsManager.java | 11 +- .../core/settings/SettingsModel.java | 2 +- .../core/utility/UtilityExceptions.java | 2 +- .../core/utility/UtilityLogger.java | 4 +- .../core/utility/UtilityNumber.java | 18 +- .../MainAccettazioneFragment.java | 2 +- .../accettazione/core/AccettazioneHelper.java | 6 +- ...OrdiniAccettazioneRESTConsumerService.java | 3 +- .../AccettazioneOrdineInevasoActivity.java | 2 +- ...OrdineAccettazioneRowDispatchCallback.java | 2 +- ...ccettazioneInevasoRESTConsumerService.java | 6 +- ...oneOrdineAccettazioneInevasoViewModel.java | 17 +- .../ContenutoBancaleActivity.java | 3 +- .../viewmodel/ContenutoBancaleViewModel.java | 7 +- .../lista_bancali/ListaBancaliActivity.java | 2 +- .../viewmodel/ListaBancaliViewModel.java | 2 +- .../gest/login/core/LoginHelper.java | 8 +- .../login/rest/LoginRESTConsumerService.java | 2 +- .../gest/login/viewmodel/LoginViewModel.java | 6 +- .../gest/main/MainFragment.java | 14 +- .../viewmodel/PickingLiberoViewModel.java | 14 +- .../picking_resi/PickingResiActivity.java | 21 +- .../ProdOrdineLavorazioneElencoFragment.java | 3 +- .../core/ProdOrdineLavorazioneHelper.java | 11 +- .../ProdOrdineProduzioneElencoFragment.java | 3 +- .../core/OrdineProduzioneHelper.java | 6 +- .../core/ProdRecuperoMaterialeHelper.java | 5 +- .../ProdVersamentoMaterialViewModel.java | 4 +- .../core/RettificaGiacenzeHelper.java | 5 +- .../viewmodel/RettificaGiacenzeViewModel.java | 15 +- .../settings/SettingsPreferenceFragment.java | 5 +- .../UltimeConsegneClienteRESTConsumer.java | 8 +- .../UltimeConsegneClienteViewModel.java | 4 +- .../UltimeConsegneMainListAdapter.java | 2 +- .../UltimeConsegneFornitoreFragment.java | 169 ++++++++++++++++ .../UltimeConsegneFornitoreListAdapter.java | 182 ++++++++++++++++++ .../UltimeConsegneFornitoreRESTConsumer.java | 49 +++++ .../gest/vendita/MainVenditaFragment.java | 3 +- .../gest/vendita/core/VenditaHelper.java | 10 +- .../gest/vendita/dto/PickingObjectDTO.java | 5 +- .../OrdiniVenditaRESTConsumerService.java | 2 +- .../vendita/viewmodel/VenditaViewModel.java | 4 +- .../VenditaOrdineInevasoActivity.java | 2 +- .../VenditaOrdineInevasoViewModel.java | 16 +- .../viewmodel/VersamentoMerceViewModel.java | 7 +- .../ArticoliInColloBottomSheetViewModel.java | 2 +- .../DialogAskCliente_Page1ViewModel.java | 4 +- .../DialogAskCliente_Page2ViewModel.java | 5 +- .../DialogAskPositionOfLU.java | 2 +- .../DialogChooseArtsFromListaArts.java | 8 +- .../input_quantity/DialogInputQuantity.java | 4 +- .../view/dialogs/scan_art/DialogScanArt.java | 11 +- .../DialogScanOrCreateLU.java | 6 +- ...n_ultime_consegne_cliente__list_header.xml | 21 -- ...ime_consegne_cliente__list_single_item.xml | 2 +- .../fragment_ultime_consegne_fornitore.xml | 56 ++++++ ...ultime_consegne_fornitore__list_header.xml | 51 +++++ ...e_consegne_fornitore__list_single_item.xml | 83 ++++++++ .../main/res/menu/activity_main_drawer.xml | 4 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../extensions/OrdiniVendita.java | 2 +- .../extensions/MenuConfigurationIME.java | 55 ++++-- .../extensions/OrdiniVendita.java | 2 +- .../extensions/OrdiniVendita.java | 4 +- 109 files changed, 882 insertions(+), 363 deletions(-) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/BarcodeRESTConsumerService.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/core/REST/model/SlackMessageDTO.java rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/CommonRESTException.java (81%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/HttpInterceptor.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/RESTBuilder.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/ArticoloRESTConsumer.java (90%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/ArticoloRESTConsumerService.java (76%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/BarcodeRESTConsumer.java (81%) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/ColliMagazzinoRESTConsumer.java (98%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/ColliMagazzinoRESTConsumerService.java (64%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/DepositoRESTConsumer.java (94%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/EntityRESTConsumer.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/EntityRESTConsumerService.java (73%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/GestSetupRESTConsumer.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/GestSetupRESTConsumerService.java (69%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/ISimpleOperationCallback.java (67%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/PosizioniRESTConsumer.java (93%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/PosizioniRESTConsumerService.java (75%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/PrinterRESTConsumer.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/PrinterRESTConsumerService.java (83%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/SystemRESTConsumer.java (94%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/SystemRESTConsumerService.java (70%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/consumers/_BaseRESTConsumer.java (94%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/deserializer/DateDeserializer.java (79%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/AvailableCodMdepsDTO.java (89%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/DistribuzioneColloDTO.java (97%) rename app/src/main/java/it/integry/integrywmsnative/{gest/vendita => core}/rest/model/DocumentoResoDTO.java (98%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/Ean128Model.java (99%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/Ean13PesoModel.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/EsitoType.java (91%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/GestSetupDTO.java (51%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/MailRequestDTO.java (97%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/NativeSqlRequestDTO.java (56%) rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/model/ServiceRESTResponse.java (88%) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java rename app/src/main/java/it/integry/integrywmsnative/core/{REST => rest}/watcher/ServerStatusChecker.java (96%) create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java create mode 100644 app/src/main/res/layout/fragment_ultime_consegne_fornitore.xml create mode 100644 app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml create mode 100644 app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index c8aba17ab61eeae540886425df62b52739eae32a..2e0f4610b5393912c904f026bac5e01e0984b3c3 100644 GIT binary patch delta 54 zcmV-60LlNv2gC=Em;`10w==PvZUK`^0zH!o0zm{2VQ_GhUji2pXOsIY)zuF|AV?ra Mn~Z;Tv$Fyb0W#_nwg3PC delta 65 zcmV-H0KWgk2gC=Em;^|G)Z?+7ZUK`=0zn2KdSzmAVUtk;C6hG*5(E%oaB!1f0v8bE X7C@mb=^5554)gEvjPzTCU6+( diff --git a/app/build.gradle b/app/build.gradle index a1bf0ed8..c92c3af2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' implementation 'androidx.appcompat:appcompat:1.1.0-rc01' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha08' + implementation 'com.google.android.material:material:1.1.0-alpha09' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01' diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index edb62d38..fce98d84 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -22,7 +22,7 @@ import android.view.View; import androidx.fragment.app.FragmentTransaction; -import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; @@ -44,6 +44,7 @@ import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamento import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; import it.integry.integrywmsnative.gest.settings.MainSettingsFragment; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment; +import it.integry.integrywmsnative.gest.ultime_consegne_fornitore.UltimeConsegneFornitoreFragment; import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment; import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment; @@ -165,6 +166,11 @@ public class MainActivity extends AppCompatActivity this.adaptViewToFragment(fragment); break; + case R.id.nav_resi_fornitore: + fragment = UltimeConsegneFornitoreFragment.newInstance(); + this.adaptViewToFragment(fragment); + break; + case R.id.nav_resi_cliente: fragment = UltimeConsegneClienteFragment.newInstance(); this.adaptViewToFragment(fragment); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/BarcodeRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/BarcodeRESTConsumerService.java deleted file mode 100644 index 108eb2dc..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/BarcodeRESTConsumerService.java +++ /dev/null @@ -1,19 +0,0 @@ -package it.integry.integrywmsnative.core.REST.consumers; - -import com.google.gson.JsonObject; - -import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; -import retrofit2.Call; -import retrofit2.http.Body; -import retrofit2.http.GET; -import retrofit2.http.POST; -import retrofit2.http.Query; - -public interface BarcodeRESTConsumerService { - - @GET("decodeEan128") - Call> decodeEan128(@Query("ean128") String ean128); - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/SlackMessageDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/model/SlackMessageDTO.java deleted file mode 100644 index a0e838b0..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/SlackMessageDTO.java +++ /dev/null @@ -1,4 +0,0 @@ -package it.integry.integrywmsnative.core.REST.model; - -public class SlackMessageDTO { -} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java index 1711f29f..2990acee 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java @@ -17,6 +17,11 @@ public class MenuConfiguration extends BaseMenuConfiguration { .setID(R.id.nav_accettazione) .setTitleText(R.string.accettazione_title_fragment) .setTitleIcon(R.drawable.ic_dashboard_accettazione)) + + .addItem(new MenuItem() + .setID(R.id.nav_resi_fornitore) + .setTitleText(R.string.fragment_ultime_consegne_fornitore_title) + .setTitleIcon(R.drawable.ic_latest_delivery)) ).addGroup( new MenuGroup() .setGroupText(R.string.checkout) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java index 45141b68..9aa6a2ea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java @@ -6,12 +6,8 @@ import com.crashlytics.android.Crashlytics; import com.orhanobut.logger.AndroidLogAdapter; import com.orhanobut.logger.Logger; -import java.io.IOException; - import io.fabric.sdk.android.Fabric; import it.integry.integrywmsnative.BuildConfig; -import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; -import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.settings.Stash; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java index 47eb4330..16ccf091 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java @@ -7,7 +7,7 @@ import java.lang.reflect.Method; import androidx.appcompat.app.AppCompatActivity; -import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/CommonRESTException.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java similarity index 81% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/CommonRESTException.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java index 9f7f9bca..36c521a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/CommonRESTException.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java @@ -1,18 +1,10 @@ -package it.integry.integrywmsnative.core.REST; - -import android.util.Log; +package it.integry.integrywmsnative.core.rest; import java.net.SocketException; import java.net.SocketTimeoutException; import java.util.HashMap; -import java.util.List; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.exception.printer.PrinterNotFoundException; -import it.integry.integrywmsnative.core.utility.UtilityString; -import retrofit2.Response; /** * Created by GiuseppeS on 22/03/2018. diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/HttpInterceptor.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java index 6bd56c67..bebc2ee8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/HttpInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java @@ -1,11 +1,10 @@ -package it.integry.integrywmsnative.core.REST; +package it.integry.integrywmsnative.core.rest; import android.util.Base64; import java.io.IOException; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityString; import okhttp3.HttpUrl; import okhttp3.Interceptor; import okhttp3.Request; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java index 2a24b26b..4d34814d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST; +package it.integry.integrywmsnative.core.rest; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -6,7 +6,7 @@ import com.google.gson.GsonBuilder; import java.sql.Date; import java.util.concurrent.TimeUnit; -import it.integry.integrywmsnative.core.REST.deserializer.DateDeserializer; +import it.integry.integrywmsnative.core.rest.deserializer.DateDeserializer; import it.integry.integrywmsnative.core.settings.SettingsManager; import okhttp3.OkHttpClient; import retrofit2.Retrofit; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java similarity index 90% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ArticoloRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java index b7e5b40b..111f53b8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ArticoloRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java @@ -1,15 +1,14 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; -import it.integry.integrywmsnative.core.utility.UtilityDB; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ArticoloRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java similarity index 76% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ArticoloRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java index 5d476b84..adc6cefc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ArticoloRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java @@ -1,8 +1,6 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; -import java.util.List; - -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbAart; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/BarcodeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java similarity index 81% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/BarcodeRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java index 7ba74db8..0a4eeff4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/BarcodeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java @@ -1,10 +1,8 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; -import com.google.gson.JsonObject; - -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java new file mode 100644 index 00000000..7bf802d8 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java @@ -0,0 +1,14 @@ +package it.integry.integrywmsnative.core.rest.consumers; + +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import retrofit2.Call; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface BarcodeRESTConsumerService { + + @GET("decodeEan128") + Call> decodeEan128(@Query("ean128") String ean128); + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java similarity index 98% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index 28d8779f..f4bb9320 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.app.ProgressDialog; import android.content.Context; @@ -11,14 +11,13 @@ import org.jetbrains.annotations.NotNull; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Calendar; import java.util.Iterator; import java.util.List; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; import it.integry.integrywmsnative.core.model.MtbAart; @@ -26,7 +25,6 @@ import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; -import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java similarity index 64% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java index 7fb6d6d5..e5471436 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java @@ -1,17 +1,12 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.google.gson.JsonObject; -import java.util.List; - -import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; -import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import retrofit2.Call; import retrofit2.http.Body; -import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java index 1f019140..e1a8d5ee 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/EntityRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java index 8995ffd4..4d58dc69 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/EntityRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java @@ -1,9 +1,8 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; import com.google.gson.Gson; -import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; @@ -11,11 +10,10 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.EntityBase; -import it.integry.integrywmsnative.core.model.MtbColt; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/EntityRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java similarity index 73% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/EntityRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java index e9fc7319..b0490457 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/EntityRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java @@ -1,12 +1,11 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.google.gson.JsonObject; import java.util.List; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; -import it.integry.integrywmsnative.core.model.EntityBase; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.POST; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java index e7f137fa..2f5eb010 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java @@ -1,10 +1,10 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.GestSetupDTO; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.GestSetupDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityLogger; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java similarity index 69% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java index 3ae911c7..051b2c12 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java @@ -1,10 +1,7 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; -import java.util.List; - -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.REST.model.GestSetupDTO; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.GestSetupDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ISimpleOperationCallback.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java similarity index 67% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ISimpleOperationCallback.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java index 3c61004f..ba8a6b72 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ISimpleOperationCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; public interface ISimpleOperationCallback { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PosizioniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java similarity index 93% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PosizioniRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java index ac8c503d..875936ee 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PosizioniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.google.gson.reflect.TypeToken; @@ -6,8 +6,8 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PosizioniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java similarity index 75% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PosizioniRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java index 4406a07f..f61efcc4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PosizioniRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java @@ -1,8 +1,8 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java index 16e766b8..9d38a097 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java @@ -1,16 +1,15 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.exception.printer.PrinterNotFoundException; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.core.utility.UtilityServer; import it.integry.integrywmsnative.core.utility.UtilityString; import retrofit2.Call; import retrofit2.Callback; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java similarity index 83% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java index 63ef3b2d..e9067533 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java @@ -1,13 +1,11 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; -import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java index c9d083f1..bd75142f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.text.TextUtils; import android.util.Log; @@ -16,14 +16,13 @@ import java.util.List; import it.integry.integrywmsnative.BuildConfig; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.REST.model.MailRequestDTO; -import it.integry.integrywmsnative.core.REST.model.NativeSqlRequestDTO; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.MailRequestDTO; +import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.Azienda; -import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityString; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java similarity index 70% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java index 4ad90c04..5330f0d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java @@ -1,11 +1,11 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.REST.model.MailRequestDTO; -import it.integry.integrywmsnative.core.REST.model.NativeSqlRequestDTO; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.MailRequestDTO; +import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/_BaseRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java index 18e96950..ba413697 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/_BaseRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java @@ -1,12 +1,12 @@ -package it.integry.integrywmsnative.core.REST.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; import java.util.List; -import it.integry.integrywmsnative.core.REST.CommonRESTException; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityString; import retrofit2.Response; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/deserializer/DateDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java similarity index 79% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/deserializer/DateDeserializer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java index 8906bd8a..5b286de1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/deserializer/DateDeserializer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.deserializer; +package it.integry.integrywmsnative.core.rest.deserializer; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -6,10 +6,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import java.lang.reflect.Type; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; -import java.util.TimeZone; import it.integry.integrywmsnative.core.utility.UtilityDate; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/AvailableCodMdepsDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java similarity index 89% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/AvailableCodMdepsDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java index befd7941..e26407cd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/AvailableCodMdepsDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; public class AvailableCodMdepsDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/DistribuzioneColloDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/DistribuzioneColloDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java index a67a4428..2166bc46 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/DistribuzioneColloDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; public class DistribuzioneColloDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/DocumentoResoDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java similarity index 98% rename from app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/DocumentoResoDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java index 53998af7..4d92d720 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/DocumentoResoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.gest.vendita.rest.model; +package it.integry.integrywmsnative.core.rest.model; import java.util.Date; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/Ean128Model.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java similarity index 99% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/Ean128Model.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java index 99a78afb..6ada378c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/Ean128Model.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; public class Ean128Model { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/Ean13PesoModel.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/Ean13PesoModel.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java index c5436078..3263a3d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/Ean13PesoModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; public class Ean13PesoModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/EsitoType.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java similarity index 91% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/EsitoType.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java index 394da0ed..d9244d8c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/EsitoType.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; /** * Created by GiuseppeS on 06/03/2018. diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/GestSetupDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java similarity index 51% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/GestSetupDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java index 8e883c04..1437a7d9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/GestSetupDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; public class GestSetupDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/MailRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/MailRequestDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java index c2d3989a..ed282c3b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/MailRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; public class MailRequestDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/NativeSqlRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java similarity index 56% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/NativeSqlRequestDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java index 36110c61..5684b5a9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/NativeSqlRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; public class NativeSqlRequestDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/ServiceRESTResponse.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java similarity index 88% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/model/ServiceRESTResponse.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java index 1b882bd2..0f06e9af 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/ServiceRESTResponse.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java @@ -1,7 +1,5 @@ -package it.integry.integrywmsnative.core.REST.model; +package it.integry.integrywmsnative.core.rest.model; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java new file mode 100644 index 00000000..2efbf28e --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java @@ -0,0 +1,4 @@ +package it.integry.integrywmsnative.core.rest.model; + +public class SlackMessageDTO { +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/watcher/ServerStatusChecker.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/REST/watcher/ServerStatusChecker.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java index 3ce343db..e3996587 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/watcher/ServerStatusChecker.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.REST.watcher; +package it.integry.integrywmsnative.core.rest.watcher; import android.os.Handler; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index b5b13054..a4df04ce 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -2,10 +2,9 @@ package it.integry.integrywmsnative.core.settings; import java.util.List; -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.model.Azienda; -import it.integry.integrywmsnative.core.model.MtbDepo; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; public class DBSettingsModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index 61a0902f..ae284e57 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -8,12 +8,11 @@ import java.net.SocketTimeoutException; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.GestSetupRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.PosizioniRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityFirebase; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java index e60fed84..bf520924 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.core.settings; -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; public class SettingsModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index cb3dcbce..de25868a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -8,7 +8,7 @@ import com.crashlytics.android.Crashlytics; import com.orhanobut.logger.Logger; import it.integry.integrywmsnative.BuildConfig; -import it.integry.integrywmsnative.core.REST.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class UtilityExceptions { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index 2e4317d5..7622df95 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -5,11 +5,9 @@ import com.orhanobut.logger.Logger; import java.io.PrintWriter; import java.io.StringWriter; import java.net.SocketTimeoutException; -import java.text.SimpleDateFormat; -import java.util.Date; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java index 920986c5..041f18c0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java @@ -1,5 +1,7 @@ package it.integry.integrywmsnative.core.utility; +import com.google.android.gms.common.internal.service.Common; + import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -13,12 +15,12 @@ public class UtilityNumber { public static String decimalToString(Float bigDecimal){ if(bigDecimal == null) return "0"; - return decimalToString(bigDecimal, 3); + return decimalToString(bigDecimal, CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS); } public static String decimalToString(BigDecimal bigDecimal){ if(bigDecimal == null) return "0"; - return decimalToString(bigDecimal, 3); + return decimalToString(bigDecimal, CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS); } public static String decimalToString(BigDecimal bigDecimal, int decimal){ @@ -71,8 +73,16 @@ public class UtilityNumber { public static Float decimalToFloat(BigDecimal bigDecimalValue) { - String tmp = decimalToString(bigDecimalValue); - return Float.parseFloat(tmp); + float multiplier = (float) Math.pow(10, CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS); + + Float floatValue = null; + + if(bigDecimalValue != null) { + int intValue = (int) (bigDecimalValue.floatValue() * multiplier); + floatValue = Float.valueOf(intValue / multiplier); + } + + return floatValue; } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index 7cadd3bb..e018cc91 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.ISearcableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java index 0e91a02a..860fe92e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java @@ -9,9 +9,9 @@ import com.annimon.stream.Stream; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityLogger; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java index b98162fa..f15e4453 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java @@ -2,12 +2,11 @@ package it.integry.integrywmsnative.gest.accettazione.rest; import java.util.List; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; import retrofit2.Call; import retrofit2.http.GET; -import retrofit2.http.POST; import retrofit2.http.Query; /** diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java index 6429fc07..7824542e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java index 91f1ee83..491ce7a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; public interface IOnOrdineAccettazioneRowDispatchCallback { 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 b3713d82..8f836e69 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 @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest; -import android.text.TextUtils; - import com.annimon.stream.Stream; import com.google.gson.reflect.TypeToken; @@ -10,8 +8,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityDate; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java index 97ec35bf..6a035df9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java @@ -12,20 +12,19 @@ import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Objects; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.GestSetupRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; -import it.integry.integrywmsnative.core.REST.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java index f48db8a4..2c75f894 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java @@ -8,12 +8,11 @@ import android.content.Intent; import android.os.Bundle; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding; import it.integry.integrywmsnative.gest.contenuto_bancale.viewmodel.ContenutoBancaleViewModel; -import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity; public class ContenutoBancaleActivity extends AppCompatActivity { 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 860ba9bc..901c17f6 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 @@ -9,12 +9,9 @@ import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; -import java.util.List; - import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.DepositoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.di.BindableString; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index a8e5c3b2..b034afea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java index 341a3370..efe91b42 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java index 63632b0e..9156a0b0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java @@ -4,10 +4,10 @@ import android.content.Context; import android.util.Log; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginDTO; import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumerService; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java index 44fa7ccb..3b4a601e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.gest.login.rest; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index f72dc910..66389586 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -13,9 +13,9 @@ import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.context.MainContext; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.di.BindableString; 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 eee1f7ee..dc0321ab 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 @@ -4,22 +4,14 @@ package it.integry.integrywmsnative.gest.main; import android.content.Context; import android.os.Bundle; -import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.DataBindingUtil; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.GridLayout; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import net.cachapa.expandablelayout.ExpandableLayout; import java.util.ArrayList; import java.util.Iterator; @@ -27,9 +19,8 @@ import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; @@ -46,7 +37,6 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainBinding; import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding; -import it.integry.integrywmsnative.databinding.FragmentMainMenuItemLayoutBinding; import it.integry.integrywmsnative.ui.ElevatedToolbar; /** diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 1b50d8e6..432b8f77 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -11,7 +11,6 @@ import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Date; import java.util.Iterator; import java.util.List; @@ -25,12 +24,12 @@ import androidx.databinding.ObservableList; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; -import it.integry.integrywmsnative.core.REST.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.expansion.RunnableArgs; @@ -52,7 +51,6 @@ import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding; import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoHelper; import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoListAdapter; -import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskCliente; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 446d6224..8401c866 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -18,20 +18,16 @@ import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; -import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; -import it.integry.integrywmsnative.core.model.DtbDocr; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.report.ReportManager; @@ -42,12 +38,10 @@ import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ActivityPickingResiBinding; -import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding; import it.integry.integrywmsnative.gest.picking_resi.dto.WithdrawableDtbDocr; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; import it.integry.integrywmsnative.gest.picking_resi.core.PickingResiListAdapter; -import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; -import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; @@ -74,12 +68,14 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC private String mDefaultGestioneOfUL; private String mDefaultCodAnagOfUL; private String mDefaultCodMDepOfUL; + private Integer mDefaultSegnoOfUL; - public static void startActivity(Context context, List documentoResoDTOList) { + public static void startActivity(Context context, List documentoResoDTOList, Integer segno) { String consegneCacheKey = DataCache.addItem(documentoResoDTOList); Intent intent = new Intent(context, PickingResiActivity.class); intent.putExtra("key", consegneCacheKey); + intent.putExtra("segno", segno); context.startActivity(intent); } @@ -98,6 +94,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC mDocumentiResiList = DataCache.retrieveItem(getIntent().getStringExtra("key")); + mDefaultSegnoOfUL = getIntent().getIntExtra("segno", +1); this.initView(); @@ -218,7 +215,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC MtbColt mtbColt = new MtbColt(); mtbColt.initDefaultFields(); mtbColt .setGestione(mDefaultGestioneOfUL) - .setSegno(+1) + .setSegno(mDefaultSegnoOfUL) .setCodAnag(mDefaultCodAnagOfUL) .setCodMdep(mDefaultCodMDepOfUL) .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); @@ -375,8 +372,6 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC item.getWithdrawRows().add(mtbColr); - int currentIndex = this.mDtbDocrList.indexOf(item); - this.refreshDtbDocrItem(item); currentMtbColt.get().getMtbColr().add(mtbColr); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java index 24cb2d5e..27f70062 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; @@ -36,7 +36,6 @@ import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.FragmentProdOrdineLavorazioneElencoBinding; import it.integry.integrywmsnative.gest.prod_ord_lavorazione.core.ProdOrdineLavorazioneHelper; import it.integry.integrywmsnative.gest.prod_ord_lavorazione.core.ProdOrdineLavorazioneListAdapter; -import it.integry.integrywmsnative.gest.vendita.core.MainListVenditaAdapter; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.VenditaOrdineInevasoActivity; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java index ea7e8b5f..5c44d1f2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java @@ -12,11 +12,11 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; @@ -24,7 +24,6 @@ import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityFirebase; import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; import it.integry.integrywmsnative.gest.vendita.rest.OrdiniVenditaRESTConsumerService; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java index 7dc7ca97..8d468d06 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -25,12 +25,11 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; -import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.databinding.FragmentProdOrdineProduzioneElencoBinding; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java index 071417db..79f77cc6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java @@ -8,9 +8,9 @@ import com.annimon.stream.Stream; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityLogger; 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 a5b6b477..45ed69c7 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 @@ -8,10 +8,9 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdUL; public class ProdRecuperoMaterialeHelper { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java index b747955b..84a4e867 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java @@ -7,10 +7,8 @@ import android.text.SpannableString; import androidx.databinding.ObservableField; -import java.util.Objects; - import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java index acbe9f66..361ac832 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java @@ -2,15 +2,14 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.core; import android.app.ProgressDialog; import android.content.Context; -import androidx.databinding.ObservableArrayList; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbAartWithFornitore; 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 d3375d0c..e2183288 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 @@ -20,18 +20,17 @@ import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Objects; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.CommonRESTException; -import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java index 75306f94..b76482ba 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java @@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.settings; import android.content.Context; import android.os.Bundle; -import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.AppCompatTextView; import androidx.preference.CheckBoxPreference; import androidx.preference.EditTextPreference; @@ -17,8 +16,8 @@ import android.util.TypedValue; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.settings.SharedPrefKeys; import it.integry.integrywmsnative.core.utility.UtilityArray; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java index b09f5151..e01e8c4c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java @@ -7,16 +7,16 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbDocr; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.gest.picking_resi.dto.WithdrawableDtbDocr; -import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; public class UltimeConsegneClienteRESTConsumer { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index abc966a5..d1c168bb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -16,7 +16,7 @@ import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteBinding; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; import it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity; -import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; public class UltimeConsegneClienteViewModel { @@ -95,7 +95,7 @@ public class UltimeConsegneClienteViewModel { private void dispatchConsegne() { List selectedConsegne = getSelectedItems(); - PickingResiActivity.startActivity(mContext, selectedConsegne); + PickingResiActivity.startActivity(mContext, selectedConsegne, +1); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java index 44e0ec0f..a7a04440 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java @@ -25,7 +25,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListHeaderBinding; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListSingleItemBinding; -import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider; public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java new file mode 100644 index 00000000..ee718b15 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java @@ -0,0 +1,169 @@ +package it.integry.integrywmsnative.gest.ultime_consegne_fornitore; + + +import android.app.ProgressDialog; +import android.content.Context; +import android.os.Bundle; + +import androidx.appcompat.widget.AppCompatTextView; +import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.annimon.stream.Stream; + +import java.util.ArrayList; +import java.util.List; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; +import it.integry.integrywmsnative.core.interfaces.ITitledFragment; +import it.integry.integrywmsnative.core.settings.SettingsManager; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityProgress; +import it.integry.integrywmsnative.databinding.FragmentUltimeConsegneFornitoreBinding; +import it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity; +import it.integry.integrywmsnative.gest.ultime_consegne_fornitore.core.UltimeConsegneFornitoreListAdapter; +import it.integry.integrywmsnative.gest.ultime_consegne_fornitore.rest.UltimeConsegneFornitoreRESTConsumer; +import it.integry.integrywmsnative.ui.ElevatedToolbar; + +/** + * A simple {@link Fragment} subclass. + */ +public class UltimeConsegneFornitoreFragment extends Fragment implements ITitledFragment, IScrollableFragment { + + private Runnable mOnPreDestroy; + private ElevatedToolbar mToolbar; + + private FragmentUltimeConsegneFornitoreBinding mBinding; + + private List mItems; + + public UltimeConsegneFornitoreFragment() { + // Required empty public constructor + } + + public static UltimeConsegneFornitoreFragment newInstance() { + UltimeConsegneFornitoreFragment fragment = new UltimeConsegneFornitoreFragment(); + Bundle args = new Bundle(); + + fragment.setArguments(args); + return fragment; + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + mBinding = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), R.layout.fragment_ultime_consegne_fornitore, container, false); + + mBinding.setViewmodel(this); + + mToolbar.setRecyclerView(mBinding.recyclerView); + + this.initView(); + + // Inflate the layout for this fragment + return mBinding.getRoot(); + } + + @Override + public void onDestroy() { + if(mOnPreDestroy != null) mOnPreDestroy.run(); + super.onDestroy(); + } + + @Override + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + titleText.setText(context.getText(R.string.fragment_ultime_consegne_fornitore_title).toString()); + } + + @Override + public void setScrollToolbar(ElevatedToolbar toolbar) { + mToolbar = toolbar; + } + + @Override + public void setOnPreDestroy(Runnable onPreDestroy) { + mOnPreDestroy = onPreDestroy; + } + + + + + private void initView() { + this.initList(); + + this.mBinding.mainFab.hide(); + this.mBinding.mainFab.setOnClickListener(v -> { + dispatchConsegne(); + }); + + } + + private void initList() { + ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(getActivity()); + + UltimeConsegneFornitoreRESTConsumer.getUltimeConsegneFornitori( + SettingsManager.i().userSession.depo.getCodMdep(), + null, + null, + consegne -> { + this.mItems = consegne; + this.initDataAdapter(consegne); + + progressDialog.dismiss(); + }, ex -> { + UtilityExceptions.defaultException(getActivity(), ex, progressDialog); + }); + } + + private void initDataAdapter(ArrayList dataset) { + UltimeConsegneFornitoreListAdapter adapter = new UltimeConsegneFornitoreListAdapter(getActivity(), dataset); + adapter.setOnSelectionChanged(this::onSingleSelectionChanged); + + mBinding.recyclerView.setHasFixedSize(true); + mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); + mBinding.recyclerView.setAdapter(adapter); + mBinding.fastscroll.setRecyclerView(mBinding.recyclerView); + + } + + + private void onSingleSelectionChanged(DocumentoResoDTO dto) { + List selectedOrders = getSelectedItems(); + + if(dto.isSelected()) { + Stream.of(selectedOrders) + .filter(x -> !x.getRagSoc().equalsIgnoreCase(dto.getRagSoc())) + .forEach(x -> x.setSelected(false)); + } + + if(selectedOrders != null && selectedOrders.size() > 0) { + mBinding.mainFab.show(); + } + else { + mBinding.mainFab.hide(); + } + } + + private List getSelectedItems() { + return Stream.of(this.mItems) + .filter(DocumentoResoDTO::isSelected) + .toList(); + } + + + private void dispatchConsegne() { + List selectedConsegne = getSelectedItems(); + + PickingResiActivity.startActivity(getActivity(), selectedConsegne, -1); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java new file mode 100644 index 00000000..b062bcdc --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java @@ -0,0 +1,182 @@ +package it.integry.integrywmsnative.gest.ultime_consegne_fornitore.core; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.core.content.ContextCompat; +import androidx.core.content.res.ResourcesCompat; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.amulyakhare.textdrawable.TextDrawable; +import com.annimon.stream.Stream; +import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.utility.UtilityDate; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityString; +import it.integry.integrywmsnative.databinding.FragmentUltimeConsegneFornitoreListHeaderBinding; +import it.integry.integrywmsnative.databinding.FragmentUltimeConsegneFornitoreListSingleItemBinding; +import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider; + +public class UltimeConsegneFornitoreListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { + + private Context mContext; + private List mDataset; + private ArrayList mSectionTitleItems; + + private RunnableArgs mOnSelectionChanged; + + @Override + public String getSectionTitle(int position) { + return mSectionTitleItems.get(position); + } + + + static class SubheaderHolder extends RecyclerView.ViewHolder { + + FragmentUltimeConsegneFornitoreListHeaderBinding mBinding; + + SubheaderHolder(FragmentUltimeConsegneFornitoreListHeaderBinding binding) { + super(binding.getRoot()); + this.mBinding = binding; + } + + } + + static class SingleItemViewHolder extends RecyclerView.ViewHolder { + + FragmentUltimeConsegneFornitoreListSingleItemBinding mBinding; + + SingleItemViewHolder(FragmentUltimeConsegneFornitoreListSingleItemBinding binding) { + super(binding.getRoot()); + this.mBinding = binding; + } + } + + + + + + public UltimeConsegneFornitoreListAdapter(Context context, ArrayList dataset) { + super(); + this.mContext = context; + this.mDataset = new ArrayList<>(); + this.mSectionTitleItems = new ArrayList<>(); + + this.mDataset = Stream.of(dataset) + .sortBy(DocumentoResoDTO::getRagSoc) + .toList(); + + + Stream.of(mDataset) + .map(DocumentoResoDTO::getRagSoc) + .distinct() + .forEach(x -> { + this.mSectionTitleItems.add(String.valueOf(x.charAt(0))); + + long count = Stream.of(dataset) + .filter(y -> y.getRagSoc().equalsIgnoreCase(x)) + .count(); + + + for(int i = 0; i < count; i++) this.mSectionTitleItems.add(String.valueOf(x.charAt(0))); + }); + + long count = Stream.of(dataset) + .filter(x -> UtilityString.isNullOrEmpty(x.getRagSoc())) + .count(); + + } + + + @Override + public SingleItemViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) { + FragmentUltimeConsegneFornitoreListSingleItemBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_ultime_consegne_fornitore__list_single_item, parent, false); + return new SingleItemViewHolder(binding); + } + + @Override + public SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) { + FragmentUltimeConsegneFornitoreListHeaderBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_ultime_consegne_fornitore__list_header, parent, false); + return new SubheaderHolder(binding); + } + + @Override + public void onBindItemViewHolder(final SingleItemViewHolder holder, final int position) { + final DocumentoResoDTO consegna = this.mDataset.get(position); + + holder.mBinding.setConsegna(consegna); + + holder.mBinding.descriptionMain.setText(UtilityString.isNullOrEmpty(consegna.getRifOrd()) ? "" : consegna.getRifOrd()); + + String numDoc = "" + consegna.getNumDoc(); + holder.mBinding.badge1.setText(numDoc); + + try { + Calendar calendarNow = UtilityDate.getCalendarInstance(); + Calendar calendarDataDoc = UtilityDate.getCalendarInstance(); + calendarDataDoc.setTime(consegna.getDataDocD()); + + String dataDocString = ""; + + if(calendarDataDoc.get(Calendar.YEAR) == calendarNow.get(Calendar.YEAR)) { + dataDocString = UtilityDate.formatDate(consegna.getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.DM_HUMAN); + } else { + dataDocString = UtilityDate.formatDate(consegna.getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN); + } + + holder.mBinding.date.setText(dataDocString); + + + holder.mBinding.compilatoDa.setText(consegna.getCompilatoDa()); + holder.mBinding.compilatoDa.setVisibility(UtilityString.isNullOrEmpty(consegna.getCompilatoDa()) ? View.GONE : View.VISIBLE); + } catch (Exception ex) { + UtilityExceptions.defaultException(mContext, ex); + } + + + holder.mBinding.getRoot().setOnClickListener(v -> { + consegna.setSelected(!consegna.isSelected()); + + if(this.mOnSelectionChanged != null) mOnSelectionChanged.run(consegna); + }); + + } + + @Override + public void onBindSubheaderViewHolder(SubheaderHolder subheaderHolder, int nextItemPosition) { + subheaderHolder.mBinding.title.setText(this.mDataset.get(nextItemPosition).getRagSoc()); + } + + @Override + public boolean onPlaceSubheaderBetweenItems(int position) { + + if(!this.mDataset.get(position).getCodAnag().equalsIgnoreCase(this.mDataset.get(position+1).getCodAnag())) { + return true; + } + + return false; + } + + @Override + public int getItemSize() { + return this.mDataset.size(); + } + + + public void setOnSelectionChanged(RunnableArgs mSelectionChanged) { + this.mOnSelectionChanged = mSelectionChanged; + } + + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java new file mode 100644 index 00000000..71e6e993 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java @@ -0,0 +1,49 @@ +package it.integry.integrywmsnative.gest.ultime_consegne_fornitore.rest; + +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.ArrayList; + +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.utility.UtilityDB; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; + +public class UltimeConsegneFornitoreRESTConsumer { + + public static void getUltimeConsegneFornitori(String codMdep, String codAnag, String codMart, RunnableArgs> onComplete, RunnableArgs onFailed) { + + int numberOfConsegnePerCli = 10; + int numberOfDayToAnalyze = 90; + + String sql = "SELECT consegne.*, " + + " rag_soc " + + "FROM WMS_GetUltimeConsegneFornitori(" + + UtilityDB.valueToString(numberOfConsegnePerCli) + ", " + + UtilityDB.valueToString(codAnag) + ", " + + UtilityDB.valueToString(codMart) + ", " + + UtilityDB.valueToString(codMdep) + ", " + + UtilityDB.valueToString(numberOfDayToAnalyze) + ") consegne " + + "LEFT OUTER JOIN gtb_anag ON consegne.cod_anag = gtb_anag.cod_anag " + + "ORDER BY rag_soc, " + + " counter_consegna "; + + + Type typeOfObjectsList = new TypeToken>() {}.getType(); + SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback>() { + @Override + public void onSuccess(ArrayList value) { + if(onComplete != null) onComplete.run(value); + } + + @Override + public void onFailed(Exception ex) { + if(onFailed != null) onFailed.run(ex); + } + }); + } + + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index ce689be6..893db7a1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -14,7 +14,6 @@ import android.text.SpannableString; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -24,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index aa4b68fb..83045003 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -12,11 +12,11 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.REST.RESTBuilder; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.EsitoType; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java index 0a1d0563..f10199f1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java @@ -4,13 +4,10 @@ import android.os.Parcel; import android.os.Parcelable; import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.List; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java index d5ff84c6..9d8593c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java @@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.vendita.rest; import java.util.List; -import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java index 621b2651..25b2a6de 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java @@ -11,8 +11,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbOrdt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java index d14f351a..d6c75f4f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java @@ -10,7 +10,7 @@ import android.view.MenuItem; import java.util.ArrayList; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; 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 dbbd6ce2..c9d41a2d 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 @@ -20,14 +20,14 @@ import java.util.Objects; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.PosizioniRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; -import it.integry.integrywmsnative.core.REST.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index 7d4a3363..1a74d122 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -12,14 +12,13 @@ import com.annimon.stream.Stream; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Date; import java.util.Iterator; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java index 5968ec0c..dc3dc7df 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java @@ -18,7 +18,7 @@ import android.widget.BaseAdapter; import java.lang.ref.WeakReference; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbColr; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java index 304e7b77..3d29a549 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.databinding.DialogAskClientePage1Binding; import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteClienteDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java index de88b82c..3eaea8fb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java @@ -12,11 +12,10 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.databinding.DialogAskClientePage2Binding; -import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteClienteDTO; import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO; public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java index 3148c251..c589fad1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index d69367ad..4a728981 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -10,7 +10,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; @@ -20,9 +19,9 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; @@ -35,7 +34,6 @@ import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsLayoutBinding; import it.integry.integrywmsnative.view.dialogs.DialogCommon; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; public class DialogChooseArtsFromListaArts { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 0c6b21c7..5c418283 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -30,8 +30,8 @@ import java.util.Date; import java.util.GregorianCalendar; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java index 557d3836..e3c309a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java @@ -11,20 +11,17 @@ import android.view.LayoutInflater; import androidx.databinding.DataBindingUtil; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; -import it.integry.integrywmsnative.core.REST.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.expansion.RunnableArgsss; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.utility.UtilityBarcode; -import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogScanArtBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index 18d1d054..facf5564 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -14,9 +14,9 @@ import android.view.View; import com.annimon.stream.Stream; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml index d77f0a29..ec125d50 100644 --- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml +++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml @@ -9,15 +9,6 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml index 0a3a97c4..fdce7099 100644 --- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml +++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml @@ -5,7 +5,7 @@ + type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" /> + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml new file mode 100644 index 00000000..1ee93afe --- /dev/null +++ b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml new file mode 100644 index 00000000..40531216 --- /dev/null +++ b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 30a46419..2be8fdfe 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -26,6 +26,10 @@ android:id="@+id/nav_free_picking" android:icon="@drawable/ic_black_barcode_scanner" android:title="@string/free_picking" /> + Crea nuova UL Apri UL Ultime consegne + Ultimi arrivi Stampante non trovata diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 935f0718..6e78878c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -227,6 +227,7 @@ Open LU Latest deliveries + Latest arrivals Printer not found diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index ac61c630..8525b193 100644 --- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -4,7 +4,7 @@ import android.app.ProgressDialog; import java.util.List; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java index 4d1cc22e..80298df6 100644 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java @@ -6,44 +6,44 @@ public class MenuConfigurationIME extends BaseMenuConfiguration { public MenuConfigurationIME() { + + this .addGroup( new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.general) + .setGroupText(it.integry.integrywmsnative.R.string.purchase) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_accettazione) .setTitleText(it.integry.integrywmsnative.R.string.accettazione_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione)) + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_resi_fornitore) + .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_fornitore_title) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery)) + ).addGroup( + new MenuGroup() + .setGroupText(it.integry.integrywmsnative.R.string.checkout) + .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_spedizione) .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)) - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze) - .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce) - .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce)) - .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_free_picking) .setTitleText(it.integry.integrywmsnative.R.string.free_picking) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero)) -// .addItem(new MenuItem() -// .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente) -// .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title) -// .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery)) - ) - .addGroup( + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente) + .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery)) + + ).addGroup( new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.production) + .setGroupText(it.integry.integrywmsnative.R.string.manufacture) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione) @@ -54,7 +54,24 @@ public class MenuConfigurationIME extends BaseMenuConfiguration { .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione) .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)) - ); + ).addGroup( + new MenuGroup() + .setGroupText(it.integry.integrywmsnative.R.string.internal_handling) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce) + .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce)) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze) + .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze)) + + + ); + + } diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index 048472d1..fcff9ab1 100644 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -4,7 +4,7 @@ import android.app.ProgressDialog; import java.util.List; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index 438ebcf9..dbd65cea 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -4,8 +4,8 @@ import android.app.ProgressDialog; import java.util.List; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt;