Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v_1_0_7(10)

Browse Source
This commit is contained in:
Gius95 2018-12-18 12:42:17 +01:00
commit 7f6b83e5b4
6 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -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"
}

12
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -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();

3
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java
View File

@ -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);

4
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@ -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();

16
pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java
View File

@ -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());
}