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

-> v1.6.13(74)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-07-29 17:10:43 +02:00
parent b68a61c762
commit 4748cf7c1c
6 changed files with 12 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

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 73 def appVersionCode = 74
def appVersionName = '1.6.12' def appVersionName = '1.6.13'
signingConfigs { signingConfigs {
release { release {

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java
View File

@ -61,7 +61,7 @@ public class ProdRecuperoMaterialeViewModel {
} }
public void openLU() { public void openLU() {
DialogScanOrCreateLU.make(mContext, true, false, mtbColt -> { DialogScanOrCreateLU.make(mContext, true, false, true, mtbColt -> {
if(mtbColt == null) { if(mtbColt == null) {
((IPoppableActivity)mContext).pop(); ((IPoppableActivity)mContext).pop();
} else if((mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(-1)){ } else if((mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(-1)){

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
View File

@ -48,7 +48,7 @@ public class ProdVersamentoMaterialViewModel {
public void openLU() { public void openLU() {
DialogScanOrCreateLU.make(mContext, true, mtbColt -> { DialogScanOrCreateLU.make(mContext, true, false, mtbColt -> {
if(mtbColt == null) { if(mtbColt == null) {
((IPoppableActivity)mContext).pop(); ((IPoppableActivity)mContext).pop();
} else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){ } else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){

2
app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
View File

@ -66,7 +66,7 @@ public class VersamentoMerceViewModel {
} }
public void openLU() { public void openLU() {
DialogScanOrCreateLU.make(mContext, true, mtbColt -> { DialogScanOrCreateLU.make(mContext, true, false, mtbColt -> {
if(mtbColt == null) { if(mtbColt == null) {
((IPoppableActivity)mContext).pop(); ((IPoppableActivity)mContext).pop();
} else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){ } else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){

13
app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java
View File

@ -50,21 +50,22 @@ public class DialogScanOrCreateLU {
public static Dialog make(final Context context, RunnableArgs<MtbColt> onDialogDismiss) { public static Dialog make(final Context context, RunnableArgs<MtbColt> onDialogDismiss) {
return new DialogScanOrCreateLU(context, false, true, onDialogDismiss).mDialog; return new DialogScanOrCreateLU(context, false, true, true, onDialogDismiss).mDialog;
} }
public static Dialog make(final Context context, boolean disableCreation, RunnableArgs<MtbColt> onDialogDismiss) { public static Dialog make(final Context context, boolean disableCreation, boolean shouldCheckIfExistDoc, RunnableArgs<MtbColt> onDialogDismiss) {
return new DialogScanOrCreateLU(context, disableCreation, true, onDialogDismiss).mDialog; return new DialogScanOrCreateLU(context, disableCreation, true, shouldCheckIfExistDoc, onDialogDismiss).mDialog;
} }
public static Dialog make(final Context context, boolean disableCreation, boolean checkResiduo, RunnableArgs<MtbColt> onDialogDismiss) { public static Dialog make(final Context context, boolean disableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, RunnableArgs<MtbColt> onDialogDismiss) {
return new DialogScanOrCreateLU(context, disableCreation, checkResiduo, onDialogDismiss).mDialog; return new DialogScanOrCreateLU(context, disableCreation, checkResiduo, shouldCheckIfExistDoc, onDialogDismiss).mDialog;
} }
private DialogScanOrCreateLU(Context context, boolean disableCreation, boolean checkResiduo, RunnableArgs<MtbColt> onDialogDismiss) { private DialogScanOrCreateLU(Context context, boolean disableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, RunnableArgs<MtbColt> onDialogDismiss) {
mOnDialogDismiss = null; mOnDialogDismiss = null;
currentMtbColt = null; currentMtbColt = null;
mShouldCheckResiduo = checkResiduo; mShouldCheckResiduo = checkResiduo;
mShouldCheckIfExistDoc = shouldCheckIfExistDoc;
mContext = context; mContext = context;