From 7aa93f9489e3b3a9872d50a4f5b0879c0f7708a8 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 13 May 2019 17:51:34 +0200 Subject: [PATCH 1/3] Implementato blocco qta nel caso di FlagQtaCnfFissa --- .idea/caches/build_file_checksums.ser | Bin 846 -> 846 bytes app/build.gradle | 8 ++++---- .../integrywmsnative/core/model/MtbAart.java | 4 ++++ .../input_quantity/DialogInputQuantity.java | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index e8c553d80bf4bedaf624fd4541f675d6c38ee3bd..ee6d72672c274954d97e040e6e0cfc67456a1382 100644 GIT binary patch delta 53 zcmV-50LuT)2F?bMm;|xNC?k=anv-(@HS8aB!1>0T&R<0T&P=vMTsY{a4;4U2HoS LNT(sQ)d6_{3E2}= diff --git a/app/build.gradle b/app/build.gradle index 4d5c8f75..bde28fa5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,13 +95,13 @@ dependencies { }) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.orhanobut:logger:2.2.0' - implementation 'com.google.firebase:firebase-core:16.0.8' + implementation 'com.google.firebase:firebase-core:16.0.9' implementation 'com.google.firebase:firebase-crash:16.2.1' - implementation 'com.google.firebase:firebase-perf:16.2.5' - implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' + implementation 'com.google.firebase:firebase-perf:17.0.0' + implementation 'com.crashlytics.sdk.android:crashlytics:2.10.0' implementation 'androidx.appcompat:appcompat:1.1.0-alpha04' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha05' + implementation 'com.google.android.material:material:1.1.0-alpha06' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04' diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java index d5168a05..cbd3646e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java @@ -703,6 +703,10 @@ public class MtbAart implements Parcelable{ return flagQtaCnfFissa; } + public boolean isFlagQtaCnfFissa() { + return "S".equalsIgnoreCase(flagQtaCnfFissa); + } + public MtbAart setFlagQtaCnfFissa(String flagQtaCnfFissa) { this.flagQtaCnfFissa = flagQtaCnfFissa; return this; 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 218f7dc4..12f66021 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 @@ -314,6 +314,10 @@ public class DialogInputQuantity { quantityDTO.qtaCnf.set(dto.getQtaCnf().floatValue()); } else { quantityDTO.qtaCnf.set(dto.mtbAart.getQtaCnf().floatValue()); + + if(dto.getMtbAart().isFlagQtaCnfFissa()) { + quantityDTO.blockedQtaPerCnf.set(true); + } } } From 88be504918d2843574c4f71595203f887b702682 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 21 May 2019 19:16:40 +0200 Subject: [PATCH 2/3] Completata implementazione di versamento materiale a produzione. --- .idea/caches/build_file_checksums.ser | Bin 846 -> 911 bytes .idea/gradle.xml | 1 + .idea/modules.xml | 1 + app/build.gradle | 1 + .../integrywmsnative/MainActivity.java | 5 + .../integrywmsnative/core/CommonConst.java | 2 + .../consumers/ColliMagazzinoRESTConsumer.java | 43 ++ .../REST/consumers/SystemRESTConsumer.java | 2 +- .../core/barcode_reader/BarcodeManager.java | 4 +- .../core/di/BindableFloat.java | 9 +- .../core/expansion/AtomicBigDecimal.java | 392 +++++++++++++ .../integrywmsnative/core/model/MtbColr.java | 8 + .../core/utility/UtilityNumber.java | 28 + .../core/utility/UtilityPosizione.java | 2 +- .../gest/main/MainFragment.java | 7 + .../viewmodel/PickingLiberoViewModel.java | 2 +- .../ProdVersamentoMaterialeFragment.java | 92 +++ .../core/ProdVersamentoMaterialHelper.java | 14 + .../ProdVersamentoMaterialViewModel.java | 125 ++++ .../VenditaOrdineInevasoViewModel.java | 16 +- .../viewmodel/VersamentoMerceViewModel.java | 4 +- .../DialogAskPositionOfLU.java | 47 +- .../drawable/ic_prod_recupero_materiale.png | Bin 0 -> 3342 bytes .../drawable/ic_prod_versamento_materiale.png | Bin 0 -> 2731 bytes .../activity_vendita_ordine_inevaso.xml | 13 +- app/src/main/res/layout/fragment_main.xml | 545 +++++++++++------- .../fragment_prod_versamento_materiale.xml | 18 + .../main/res/menu/activity_main_drawer.xml | 16 + app/src/main/res/values-it/strings.xml | 4 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/styles.xml | 8 + build.gradle | 6 +- honeywellscannerlibrary/.gitignore | 1 + honeywellscannerlibrary/build.gradle | 34 ++ .../libs/DataCollection.aar | Bin 0 -> 117044 bytes honeywellscannerlibrary/proguard-rules.pro | 21 + .../ExampleInstrumentedTest.java | 27 + .../src/main/AndroidManifest.xml | 6 + .../HoneyWellBarcodeReader.java | 61 ++ .../src/main/res/values/strings.xml | 3 + .../ExampleUnitTest.java | 17 + settings.gradle | 2 +- 42 files changed, 1350 insertions(+), 240 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/expansion/AtomicBigDecimal.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ProdVersamentoMaterialHelper.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java create mode 100644 app/src/main/res/drawable/ic_prod_recupero_materiale.png create mode 100644 app/src/main/res/drawable/ic_prod_versamento_materiale.png create mode 100644 app/src/main/res/layout/fragment_prod_versamento_materiale.xml create mode 100644 honeywellscannerlibrary/.gitignore create mode 100644 honeywellscannerlibrary/build.gradle create mode 100644 honeywellscannerlibrary/libs/DataCollection.aar create mode 100644 honeywellscannerlibrary/proguard-rules.pro create mode 100644 honeywellscannerlibrary/src/androidTest/java/it/integry/honeywellscannerlibrary/ExampleInstrumentedTest.java create mode 100644 honeywellscannerlibrary/src/main/AndroidManifest.xml create mode 100644 honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java create mode 100644 honeywellscannerlibrary/src/main/res/values/strings.xml create mode 100644 honeywellscannerlibrary/src/test/java/it/integry/honeywellscannerlibrary/ExampleUnitTest.java diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ee6d72672c274954d97e040e6e0cfc67456a1382..9cf72370b2844100383e52d71c5a0baf535d4c9f 100644 GIT binary patch delta 154 zcmV;L0A>Hq29F1jm;}_Qmfew@OaTm$=}nVu0X+&NXm4(1d3R-OY?JB&B@hdMRUyd* zUvS#Kur1!U7-5q%0XYN^VQ_GhfdLmh5@MQ2mcGH%LfDj~vtO&CbN~-?Wps3DZfA2Y zXL4a=Y-M$E0Db@l0000G5H|D-p(jt*TK1i-#g6mAlK}!^5R(;vT$o~k7*gF%eLbnx IIFoY%+sK|iXaE2J delta 141 zcmV;80CNA22hIkNm;|xNC?k=aOaTj#=}nWg0XGI9dSzmAVUv9UB@nR@Q6N;-5{H-- z32!_YbQF{60UbQc