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

Finish v1_10_8(111)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-12-17 13:00:21 +01:00
commit 5316826be6
4 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 110
def appVersionName = '1.10.7'
def appVersionCode = 111
def appVersionName = '1.10.8'
signingConfigs {
release {

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

@ -26,6 +26,7 @@ public class DBSettingsModel {
private boolean flagCanAutoOpenNewULAccettazione;
private boolean flagCanAddExtraQuantitySpedizione;
private boolean flagEnableCheckDepositoSpedizione;
private boolean flagAskPesoColloSpedizione;
private boolean flagForceAllToColli;
public List<String> getAvailableProfiles() {
@ -152,6 +153,15 @@ public class DBSettingsModel {
return this;
}
public boolean isFlagAskPesoColloSpedizione() {
return flagAskPesoColloSpedizione;
}
public DBSettingsModel setFlagAskPesoColloSpedizione(boolean flagAskPesoColloSpedizione) {
this.flagAskPesoColloSpedizione = flagAskPesoColloSpedizione;
return this;
}
public boolean isFlagForceAllToColli() {
return flagForceAllToColli;
}

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

@ -222,6 +222,10 @@ public class SettingsManager {
.setGestName("PICKING")
.setSection("SETUP")
.setKeySection("FLAG_FORCE_ALL_TO_COLLI"));
stbGestSetupList.add(new StbGestSetup()
.setGestName("PICKING")
.setSection("SETUP")
.setKeySection("FLAG_ASK_PESO_COLLO"));
GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@ -236,6 +240,7 @@ public class SettingsManager {
dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class));
dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list, "ENABLE_CHECK_DEPOSITO", Boolean.class));
dbSettingsModelIstance.setFlagForceAllToColli(getValueFromList(list, "FLAG_FORCE_ALL_TO_COLLI", Boolean.class));
dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "FLAG_ASK_PESO_COLLO", Boolean.class));
if(onComplete != null) onComplete.run();
}, onFailed);

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

@ -868,12 +868,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
ColliMagazzinoRESTConsumer.doesColloContainsAnyRow(currentMtbColt, containRows -> {
if(containRows) {
DialogInputPeso.make(mActivity, currentMtbColt.getCodTcol(), currentMtbColt.getPesoNettoKg(), currentMtbColt.getPesoKg(), (newCodTcol, newNetWeight, newGrossWeight) -> {
currentMtbColt.setCodTcol(newCodTcol);
currentMtbColt.setPesoNettoKg(newNetWeight);
currentMtbColt.setPesoKg(newGrossWeight);
Runnable saveAction = () -> {
ColliMagazzinoRESTConsumer.updateDataFine(
mActivity,
progress,
@ -885,7 +880,21 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
progress.dismiss();
}
}));
};
if(SettingsManager.iDB().isFlagAskPesoColloSpedizione()) {
DialogInputPeso.make(mActivity, currentMtbColt.getCodTcol(), currentMtbColt.getPesoNettoKg(), currentMtbColt.getPesoKg(), (newCodTcol, newNetWeight, newGrossWeight) -> {
currentMtbColt.setCodTcol(newCodTcol);
currentMtbColt.setPesoNettoKg(newNetWeight);
currentMtbColt.setPesoKg(newGrossWeight);
saveAction.run();
}).show();
} else {
saveAction.run();
}
} else {
if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
deleteCollo(progress, onComplete);