Finish v_1_0_7(10)
This commit is contained in:
commit
7f6b83e5b4
BIN
.idea/caches/build_file_checksums.ser
generated
BIN
.idea/caches/build_file_checksums.ser
generated
Binary file not shown.
@ -21,8 +21,8 @@ android {
|
|||||||
applicationId "it.integry.integrywmsnative"
|
applicationId "it.integry.integrywmsnative"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
versionCode 9
|
versionCode 10
|
||||||
versionName "1.0.6"
|
versionName "1.0.7"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -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();
|
||||||
|
|||||||
@ -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);
|
||||||
|
|
||||||
|
|||||||
@ -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();
|
||||||
|
|||||||
@ -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()){
|
||||||
mBackupResultType = mScanManager.aDecodeGetResultType();
|
try{
|
||||||
mScanManager.aDecodeSetResultType(ScanConst.ResultType.DCD_RESULT_USERMSG);
|
|
||||||
|
mBackupResultType = mScanManager.aDecodeGetResultType();
|
||||||
|
mScanManager.aDecodeSetResultType(ScanConst.ResultType.DCD_RESULT_USERMSG);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
throw new BarcodeAdapterNotFoundException(getAdapterName());
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new BarcodeAdapterNotFoundException(getAdapterName());
|
throw new BarcodeAdapterNotFoundException(getAdapterName());
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user