Aggiunti controlli per evitare righe duplicate in Vendita.

Fix su gestione UL in caso di Stampante non configurata.
Migliorato controllo disponibiltà barcode reader su PointMobile.
This commit is contained in:
Gius95 2018-12-18 12:40:26 +01:00
parent 3e31041b7d
commit 5bc14109f4
5 changed files with 26 additions and 9 deletions

Binary file not shown.

View File

@ -86,6 +86,18 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
isMtbColtLoaded.set(mtbColt != null); isMtbColtLoaded.set(mtbColt != null);
if(this.mtbColt.get().getMtbColr() == null) this.mtbColt.get().setMtbColr(new ObservableArrayList<>()); if(this.mtbColt.get().getMtbColr() == null) this.mtbColt.get().setMtbColr(new ObservableArrayList<>());
else {
ObservableArrayList<MtbColr> 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(); initRecyclerView();
initBottomSheetActions(); initBottomSheetActions();

View File

@ -61,8 +61,7 @@ public class VenditaOrdineInevasoHelper {
if(tmpList.get(i).isHidden() == null || forceHiddenCheck) { if(tmpList.get(i).isHidden() == null || forceHiddenCheck) {
PickingObjectDTO tmpItem = tmpList.get(i); PickingObjectDTO tmpItem = tmpList.get(i);
if ( (tmpItem.getNumCollo() != null && tmpItem.getQtaCollo().floatValue() <= 0) || if (tmpItem.getQtaCollo().floatValue() <= 0) {
(tmpItem.getNumCollo() == null && tmpItem.getQtaOrd().floatValue() <= 0)) {
tmpItem.setHidden(true); tmpItem.setHidden(true);
} else tmpItem.setHidden(false); } else tmpItem.setHidden(false);

View File

@ -728,10 +728,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
postCloseOperations(); postCloseOperations();
} }
} else { } else {
mArticoliInColloBottomSheetViewModel.mtbColt.set(null);
isFabVisible.set(true);
progress.dismiss(); progress.dismiss();
String errorMessage = "Nessuna stampante configurata"; String errorMessage = "Nessuna stampante configurata";
DialogSimpleMessageHelper.makeWarningDialog(mActivity, new SpannableString(errorMessage), null, () -> postCloseOperations()).show(); DialogSimpleMessageHelper.makeWarningDialog(mActivity, new SpannableString(errorMessage), null, () -> postCloseOperations()).show();

View File

@ -37,14 +37,24 @@ public class PointMobileBarcodeReader implements BarcodeReaderInterface {
@Override @Override
public boolean isRightAdapter() { public boolean isRightAdapter() {
return mScanManager != null; try {
mScanManager.aDecodeGetResultType();
return true;
} catch (Exception ex) {
return false;
}
} }
@Override @Override
public void init() throws BarcodeAdapterNotFoundException { public void init() throws BarcodeAdapterNotFoundException {
if(isRightAdapter()){ if(isRightAdapter()){
try{
mBackupResultType = mScanManager.aDecodeGetResultType(); mBackupResultType = mScanManager.aDecodeGetResultType();
mScanManager.aDecodeSetResultType(ScanConst.ResultType.DCD_RESULT_USERMSG); mScanManager.aDecodeSetResultType(ScanConst.ResultType.DCD_RESULT_USERMSG);
} catch (Exception ex) {
throw new BarcodeAdapterNotFoundException(getAdapterName());
}
} else { } else {
throw new BarcodeAdapterNotFoundException(getAdapterName()); throw new BarcodeAdapterNotFoundException(getAdapterName());
} }