From 5bc14109f41586cded276d907981263ab3cfd5b3 Mon Sep 17 00:00:00 2001 From: Gius95 Date: Tue, 18 Dec 2018 12:40:26 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Aggiunti=20controlli=20per=20evitare=20righ?= =?UTF-8?q?e=20duplicate=20in=20Vendita.=20Fix=20su=20gestione=20UL=20in?= =?UTF-8?q?=20caso=20di=20Stampante=20non=20configurata.=20Migliorato=20co?= =?UTF-8?q?ntrollo=20disponibilt=C3=A0=20barcode=20reader=20su=20PointMobi?= =?UTF-8?q?le.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 728 -> 728 bytes .../viewmodel/RettificaGiacenzeViewModel.java | 12 ++++++++++++ .../core/VenditaOrdineInevasoHelper.java | 3 +-- .../VenditaOrdineInevasoViewModel.java | 4 ---- .../PointMobileBarcodeReader.java | 16 +++++++++++++--- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1d2a4331b11447280283558c0d8c51a9b78a4a9a..2eecbbfcce913f6489724987dadccc40fb261550 100644 GIT binary patch delta 15 Xcmcb?dV_Vs43@nsuZe7&W5WahId%rZ delta 15 Xcmcb?dV_Vs43@QLn(8*rv0(xLIt2#n 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 fc251119..10a88396 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 @@ -86,6 +86,18 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked isMtbColtLoaded.set(mtbColt != null); if(this.mtbColt.get().getMtbColr() == null) this.mtbColt.get().setMtbColr(new ObservableArrayList<>()); + else { + ObservableArrayList mtbColrList = this.mtbColt.get().getMtbColr(); + + for(int i = 0; i < mtbColrList.size(); i++) { + if(mtbColrList.get(i).getQtaCol() == null || mtbColrList.get(i).getQtaCol().floatValue() < 0){ + mtbColrList.remove(i); + i--; + } + } + + } + initRecyclerView(); initBottomSheetActions(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java index d053558a..2780cdb5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java @@ -61,8 +61,7 @@ public class VenditaOrdineInevasoHelper { if(tmpList.get(i).isHidden() == null || forceHiddenCheck) { PickingObjectDTO tmpItem = tmpList.get(i); - if ( (tmpItem.getNumCollo() != null && tmpItem.getQtaCollo().floatValue() <= 0) || - (tmpItem.getNumCollo() == null && tmpItem.getQtaOrd().floatValue() <= 0)) { + if (tmpItem.getQtaCollo().floatValue() <= 0) { tmpItem.setHidden(true); } else tmpItem.setHidden(false); 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 2f7d03c1..006a5eb9 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 @@ -728,10 +728,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO postCloseOperations(); } } else { - - mArticoliInColloBottomSheetViewModel.mtbColt.set(null); - isFabVisible.set(true); - progress.dismiss(); String errorMessage = "Nessuna stampante configurata"; DialogSimpleMessageHelper.makeWarningDialog(mActivity, new SpannableString(errorMessage), null, () -> postCloseOperations()).show(); diff --git a/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java b/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java index 1158ea33..4343d544 100644 --- a/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java +++ b/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java @@ -37,14 +37,24 @@ public class PointMobileBarcodeReader implements BarcodeReaderInterface { @Override public boolean isRightAdapter() { - return mScanManager != null; + try { + mScanManager.aDecodeGetResultType(); + return true; + } catch (Exception ex) { + return false; + } } @Override public void init() throws BarcodeAdapterNotFoundException { if(isRightAdapter()){ - mBackupResultType = mScanManager.aDecodeGetResultType(); - mScanManager.aDecodeSetResultType(ScanConst.ResultType.DCD_RESULT_USERMSG); + try{ + + mBackupResultType = mScanManager.aDecodeGetResultType(); + mScanManager.aDecodeSetResultType(ScanConst.ResultType.DCD_RESULT_USERMSG); + } catch (Exception ex) { + throw new BarcodeAdapterNotFoundException(getAdapterName()); + } } else { throw new BarcodeAdapterNotFoundException(getAdapterName()); } From 0068c56f082125bea03a86deb11391c0f63644d5 Mon Sep 17 00:00:00 2001 From: Gius95 Date: Tue, 18 Dec 2018 12:42:04 +0100 Subject: [PATCH 2/2] -> v1.0.7 (10) --- .idea/caches/build_file_checksums.ser | Bin 728 -> 728 bytes app/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2eecbbfcce913f6489724987dadccc40fb261550..86593ed04da849f1e7ceebda91eb68a695506972 100644 GIT binary patch delta 36 ucmV+<0NelA1=t0Um;}Kd$A*!dwGdMz2~xZy`*+K}!i4^G*H5!y0e1m9l@T2P delta 36 ucmV+<0NelA1=t0Um;}A4))bMPwGgNMK3v~McO=%Ujs7R#VhXci0e1mSCJ{3L diff --git a/app/build.gradle b/app/build.gradle index 52e17345..6623a91a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId "it.integry.integrywmsnative" minSdkVersion 21 targetSdkVersion 28 - versionCode 9 - versionName "1.0.6" + versionCode 10 + versionName "1.0.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }