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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano 2023-03-14 19:17:19 +01:00
commit 78c6e98084
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 348
def appVersionName = '1.32.08'
def appVersionCode = 349
def appVersionName = '1.32.09'
signingConfigs {
release {

1
app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
View File

@ -138,7 +138,6 @@ public class PVOrdineAcquistoEditViewModel {
} catch (Exception e) {
this.sendError(e);
BarcodeManager.enable();
} finally {
}
}

10
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@ -1240,9 +1240,12 @@ public class SpedizioneViewModel {
return;
}
var clonedSourceMtbColr = (MtbColr) mtbColrToDispatch.clone();
clonedSourceMtbColr.setMtbPartitaMag(null)
.setMtbAart(null);
MtbColr clonedSourceMtbColr = null;
if (mtbColrToDispatch != null) {
clonedSourceMtbColr = (MtbColr) mtbColrToDispatch.clone();
clonedSourceMtbColr.setMtbPartitaMag(null)
.setMtbAart(null);
}
var clonedTargetMtbColt = (MtbColt) mCurrentMtbColt.clone();
clonedTargetMtbColt.setMtbColr(null);
@ -1341,7 +1344,6 @@ public class SpedizioneViewModel {
}, this::sendError);
// MtbColt mtbColt = new MtbColt()
// .setNumCollo(mtbColrToUpdate.getNumCollo())
// .setDataCollo(mtbColrToUpdate.getDataColloS())