Fix after merge
This commit is contained in:
parent
a80cf53f08
commit
71f077a617
6
.idea/AndroidProjectSystem.xml
generated
Normal file
6
.idea/AndroidProjectSystem.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="AndroidProjectSystem">
|
||||||
|
<option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -3,13 +3,13 @@ package it.integry.integrywmsnative.core.exception;
|
|||||||
import it.integry.integrywmsnative.R;
|
import it.integry.integrywmsnative.R;
|
||||||
import it.integry.integrywmsnative.core.utility.UtilityResources;
|
import it.integry.integrywmsnative.core.utility.UtilityResources;
|
||||||
|
|
||||||
public final class InvalidCodMdepLUException extends Exception {
|
public final class InvalidCodMdepException extends Exception {
|
||||||
|
|
||||||
public InvalidCodMdepLUException() {
|
public InvalidCodMdepException() {
|
||||||
super(UtilityResources.getString(R.string.invalid_codmdep_error_message));
|
super(UtilityResources.getString(R.string.invalid_codmdep_error_message));
|
||||||
}
|
}
|
||||||
|
|
||||||
public InvalidCodMdepLUException(String codMdep) {
|
public InvalidCodMdepException(String codMdep) {
|
||||||
super(UtilityResources.getString(R.string.invalid_codmdep_error_message) + "(" + codMdep + ")");
|
super(UtilityResources.getString(R.string.invalid_codmdep_error_message) + "(" + codMdep + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ import javax.inject.Inject;
|
|||||||
|
|
||||||
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
|
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
|
||||||
import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
|
import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
|
||||||
import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
|
import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
|
import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
|
import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
|
||||||
@ -245,7 +245,7 @@ public class PickingLiberoViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
pickMerceULtoUL(mtbColt, articolo);
|
pickMerceULtoUL(mtbColt, articolo);
|
||||||
} else throw new InvalidCodMdepLUException();
|
} else throw new InvalidCodMdepException();
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -271,7 +271,7 @@ public class PickingLiberoViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
pickMerceULtoUL(mtbColtScanned);
|
pickMerceULtoUL(mtbColtScanned);
|
||||||
} else throw new InvalidCodMdepLUException();
|
} else throw new InvalidCodMdepException();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
throw new NoLUFoundException();
|
throw new NoLUFoundException();
|
||||||
|
|||||||
@ -14,7 +14,7 @@ import java.util.List;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
|
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
|
||||||
import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
|
import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
|
import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
|
||||||
import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException;
|
import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException;
|
||||||
@ -116,7 +116,7 @@ public class ProdVersamentoMaterialeViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
this.onLUOpened(mtbColt);
|
this.onLUOpened(mtbColt);
|
||||||
} else this.sendError(new InvalidCodMdepLUException());
|
} else this.sendError(new InvalidCodMdepException());
|
||||||
|
|
||||||
}, this::sendError);
|
}, this::sendError);
|
||||||
} else {
|
} else {
|
||||||
@ -135,7 +135,7 @@ public class ProdVersamentoMaterialeViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
this.onLUOpened(mtbColt);
|
this.onLUOpened(mtbColt);
|
||||||
} else this.sendError(new InvalidCodMdepLUException());
|
} else this.sendError(new InvalidCodMdepException());
|
||||||
|
|
||||||
}, this::sendError);
|
}, this::sendError);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -284,7 +284,7 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
|
|||||||
handler.post(() -> {
|
handler.post(() -> {
|
||||||
dialogInputQuantityV2View
|
dialogInputQuantityV2View
|
||||||
.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
|
.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
|
||||||
.setOnComplete((resultDTO, shouldCloseLU) -> {
|
.setOnComplete(resultDTO -> {
|
||||||
|
|
||||||
PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
|
PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
|
||||||
.setNumCnf(resultDTO.getNumCnf())
|
.setNumCnf(resultDTO.getNumCnf())
|
||||||
|
|||||||
@ -29,7 +29,7 @@ import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
|
|||||||
import it.integry.integrywmsnative.core.CommonConst;
|
import it.integry.integrywmsnative.core.CommonConst;
|
||||||
import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
|
import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
|
||||||
import it.integry.integrywmsnative.core.exception.EmptyLUException;
|
import it.integry.integrywmsnative.core.exception.EmptyLUException;
|
||||||
import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
|
import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
|
||||||
import it.integry.integrywmsnative.core.exception.InvalidLUException;
|
import it.integry.integrywmsnative.core.exception.InvalidLUException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
|
import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
||||||
@ -640,7 +640,7 @@ public class SpedizioneViewModel {
|
|||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
this.createNewLU(null, null);
|
this.createNewLU(null, null);
|
||||||
searchArtFromUL(mtbColt);
|
searchArtFromUL(mtbColt);
|
||||||
} else throw new InvalidCodMdepLUException();
|
} else throw new InvalidCodMdepException();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -681,7 +681,7 @@ public class SpedizioneViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
this.searchArtFromUL(mtbColt);
|
this.searchArtFromUL(mtbColt);
|
||||||
} else throw new InvalidCodMdepLUException();
|
} else throw new InvalidCodMdepException();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
throw new EmptyLUException();
|
throw new EmptyLUException();
|
||||||
@ -700,7 +700,7 @@ public class SpedizioneViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid && codMdepMatchPreviousPick) {
|
if (codMdepIsValid && codMdepMatchPreviousPick) {
|
||||||
searchArtFromUL(mtbColt);
|
searchArtFromUL(mtbColt);
|
||||||
} else throw new InvalidCodMdepLUException();
|
} else throw new InvalidCodMdepException();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
throw new InvalidLUException();
|
throw new InvalidLUException();
|
||||||
|
|||||||
@ -14,7 +14,7 @@ import java.util.List;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
|
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
|
||||||
import it.integry.integrywmsnative.core.exception.InvalidCodMdepLUException;
|
import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
|
||||||
import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
|
import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoArtsInLUException;
|
import it.integry.integrywmsnative.core.exception.NoArtsInLUException;
|
||||||
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
import it.integry.integrywmsnative.core.exception.NoLUFoundException;
|
||||||
@ -141,7 +141,7 @@ public class VersamentoMerceViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
pickMerceULtoUL(mtbColt, onComplete);
|
pickMerceULtoUL(mtbColt, onComplete);
|
||||||
} else this.sendError(new InvalidCodMdepLUException());
|
} else this.sendError(new InvalidCodMdepException());
|
||||||
|
|
||||||
}, this::sendError);
|
}, this::sendError);
|
||||||
} else {
|
} else {
|
||||||
@ -198,7 +198,7 @@ public class VersamentoMerceViewModel {
|
|||||||
|
|
||||||
if (codMdepIsValid) {
|
if (codMdepIsValid) {
|
||||||
pickMerceULtoUL(mtbColt, onComplete);
|
pickMerceULtoUL(mtbColt, onComplete);
|
||||||
} else this.sendError(new InvalidCodMdepLUException());
|
} else this.sendError(new InvalidCodMdepException());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user