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

Finish v1_6_15(76)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-08-01 12:55:23 +02:00
commit c2dae53e8f
5 changed files with 22 additions and 4 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 {
def appVersionCode = 75
def appVersionName = '1.6.14'
def appVersionCode = 76
def appVersionName = '1.6.15'
signingConfigs {
release {

10
app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
View File

@ -25,6 +25,7 @@ public class DBSettingsModel {
private boolean flagCanAddExtraItemSpedizione;
private boolean flagCanAutoOpenNewULAccettazione;
private boolean flagCanAddExtraQuantitySpedizione;
public List<String> getAvailableProfiles() {
return availableProfiles;
@ -130,4 +131,13 @@ public class DBSettingsModel {
this.flagCanAutoOpenNewULAccettazione = flagCanAutoOpenNewULAccettazione;
return this;
}
public boolean isFlagCanAddExtraQuantitySpedizione() {
return flagCanAddExtraQuantitySpedizione;
}
public DBSettingsModel setFlagCanAddExtraQuantitySpedizione(boolean flagCanAddExtraQuantitySpedizione) {
this.flagCanAddExtraQuantitySpedizione = flagCanAddExtraQuantitySpedizione;
return this;
}
}

9
app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
View File

@ -198,7 +198,14 @@ public class SettingsManager {
GestSetupRESTConsumer.getBooleanValue("PICKING", "ACCETTAZIONE", "FLAG_AUTO_OPEN_NEW_UL", valueCanAutoOpenNewUL -> {
dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(valueCanAutoOpenNewUL);
if(onComplete != null) onComplete.run();
GestSetupRESTConsumer.getBooleanValue("PICKING", "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_QUANTITY", valueCanAddExtraQuantitySpedizione -> {
dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(valueCanAddExtraQuantitySpedizione);
if(onComplete != null) onComplete.run();
}, ex -> {
if(onFailed != null) onFailed.run(ex);
});
}, ex -> {
if(onFailed != null) onFailed.run(ex);

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

@ -1188,7 +1188,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
DialogInputQuantity.makeBase(mActivity, dto, false, (quantityDTO, closeUL) -> onOrdineRowDispatched(item, quantityDTO, closeUL), null).show();
boolean canOverflowQuantity = SettingsManager.iDB().isFlagCanAddExtraQuantitySpedizione();
DialogInputQuantity.makeBase(mActivity, dto, canOverflowQuantity, (quantityDTO, closeUL) -> onOrdineRowDispatched(item, quantityDTO, closeUL), null).show();
}
}