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

Creato flag per abilitare / disabilitare la richiesta del peso in fase di chiusura UL

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-12-17 12:59:31 +01:00
parent ffea9d78e5
commit cc7c41d177
3 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 flagCanAutoOpenNewULAccettazione;
private boolean flagCanAddExtraQuantitySpedizione; private boolean flagCanAddExtraQuantitySpedizione;
private boolean flagEnableCheckDepositoSpedizione; private boolean flagEnableCheckDepositoSpedizione;
private boolean flagAskPesoColloSpedizione;
private boolean flagForceAllToColli; private boolean flagForceAllToColli;
public List<String> getAvailableProfiles() { public List<String> getAvailableProfiles() {
@ -152,6 +153,15 @@ public class DBSettingsModel {
return this; return this;
} }
public boolean isFlagAskPesoColloSpedizione() {
return flagAskPesoColloSpedizione;
}
public DBSettingsModel setFlagAskPesoColloSpedizione(boolean flagAskPesoColloSpedizione) {
this.flagAskPesoColloSpedizione = flagAskPesoColloSpedizione;
return this;
}
public boolean isFlagForceAllToColli() { public boolean isFlagForceAllToColli() {
return flagForceAllToColli; 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") .setGestName("PICKING")
.setSection("SETUP") .setSection("SETUP")
.setKeySection("FLAG_FORCE_ALL_TO_COLLI")); .setKeySection("FLAG_FORCE_ALL_TO_COLLI"));
stbGestSetupList.add(new StbGestSetup()
.setGestName("PICKING")
.setSection("SETUP")
.setKeySection("FLAG_ASK_PESO_COLLO"));
GestSetupRESTConsumer.getValues(stbGestSetupList, list -> { GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@ -236,6 +240,7 @@ public class SettingsManager {
dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class)); dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class));
dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list, "ENABLE_CHECK_DEPOSITO", Boolean.class)); dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list, "ENABLE_CHECK_DEPOSITO", Boolean.class));
dbSettingsModelIstance.setFlagForceAllToColli(getValueFromList(list, "FLAG_FORCE_ALL_TO_COLLI", 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(); if(onComplete != null) onComplete.run();
}, onFailed); }, onFailed);

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

@ -868,24 +868,33 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
ColliMagazzinoRESTConsumer.doesColloContainsAnyRow(currentMtbColt, containRows -> { ColliMagazzinoRESTConsumer.doesColloContainsAnyRow(currentMtbColt, containRows -> {
if(containRows) { if(containRows) {
DialogInputPeso.make(mActivity, currentMtbColt.getCodTcol(), currentMtbColt.getPesoNettoKg(), currentMtbColt.getPesoKg(), (newCodTcol, newNetWeight, newGrossWeight) -> { Runnable saveAction = () -> {
currentMtbColt.setCodTcol(newCodTcol);
currentMtbColt.setPesoNettoKg(newNetWeight);
currentMtbColt.setPesoKg(newGrossWeight);
ColliMagazzinoRESTConsumer.updateDataFine( ColliMagazzinoRESTConsumer.updateDataFine(
mActivity, mActivity,
progress, progress,
currentMtbColt, currentMtbColt,
() -> distribuisciCollo(progress, (generatedMtbColts) -> { () -> distribuisciCollo(progress, (generatedMtbColts) -> {
if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete); if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete);
else { else {
postCloseOperations(generatedMtbColts, onComplete); postCloseOperations(generatedMtbColts, onComplete);
progress.dismiss(); progress.dismiss();
} }
})); }));
}).show(); };
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 { } else {
if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID); if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
deleteCollo(progress, onComplete); deleteCollo(progress, onComplete);