Merge branch 'feature/Refactoring_Spedizione' into Refactoring_Spedizione_and_PickingLibero
This commit is contained in:
commit
7005ccf97a
@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 144
|
def appVersionCode = 145
|
||||||
def appVersionName = '1.13.2'
|
def appVersionName = '1.13.3'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -514,10 +514,10 @@ public class SpedizioneViewModel {
|
|||||||
|
|
||||||
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
||||||
|
|
||||||
if(!mEnableGiacenza) {
|
// if(!mEnableGiacenza) {
|
||||||
pickDataDTO.getManualPickDTO().setNumCnf(null);
|
// pickDataDTO.getManualPickDTO().setNumCnf(null);
|
||||||
pickDataDTO.getManualPickDTO().setQtaTot(null);
|
// pickDataDTO.getManualPickDTO().setQtaTot(null);
|
||||||
}
|
// }
|
||||||
|
|
||||||
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user