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:
parent
3e31041b7d
commit
5bc14109f4
BIN
.idea/caches/build_file_checksums.ser
generated
BIN
.idea/caches/build_file_checksums.ser
generated
Binary file not shown.
@ -86,6 +86,18 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
|
||||
isMtbColtLoaded.set(mtbColt != null);
|
||||
|
||||
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();
|
||||
initBottomSheetActions();
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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());
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user