Finish v1.41.02(450)
This commit is contained in:
commit
77c5252bf6
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 448
|
def appVersionCode = 450
|
||||||
def appVersionName = '1.41.00'
|
def appVersionName = '1.41.02'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -81,6 +81,7 @@ public class DBSettingsModel {
|
|||||||
private boolean flagPickingLiberoEnableScanArt = false;
|
private boolean flagPickingLiberoEnableScanArt = false;
|
||||||
private boolean flagAskDuplicateUDSSpedizione = false;
|
private boolean flagAskDuplicateUDSSpedizione = false;
|
||||||
private boolean suggestDataScad = false;
|
private boolean suggestDataScad = false;
|
||||||
|
private boolean flagPositionChangeRequest = false;
|
||||||
private String docInterniRequestNumDoc;
|
private String docInterniRequestNumDoc;
|
||||||
|
|
||||||
public boolean isFlagSpedizioneEnableFakeGiacenza() {
|
public boolean isFlagSpedizioneEnableFakeGiacenza() {
|
||||||
@ -703,4 +704,13 @@ public class DBSettingsModel {
|
|||||||
this.docInterniRequestNumDoc = docInterniRequestNumDoc;
|
this.docInterniRequestNumDoc = docInterniRequestNumDoc;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isFlagPositionChangeRequest() {
|
||||||
|
return flagPositionChangeRequest;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DBSettingsModel setFlagPositionChangeRequest(boolean flagPositionChangeRequest) {
|
||||||
|
this.flagPositionChangeRequest = flagPositionChangeRequest;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -540,6 +540,12 @@ public class SettingsManager {
|
|||||||
.setKeySection("ENABLE_SCAN_ART")
|
.setKeySection("ENABLE_SCAN_ART")
|
||||||
.setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt)
|
.setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt)
|
||||||
.setDefaultValue(true));
|
.setDefaultValue(true));
|
||||||
|
stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
|
||||||
|
.setGestName("PICKING")
|
||||||
|
.setSection("SETUP")
|
||||||
|
.setKeySection("ENABLE_POSITION_CHANGE_REQUEST")
|
||||||
|
.setSetter(dbSettingsModelIstance::setFlagPositionChangeRequest)
|
||||||
|
.setDefaultValue(true));
|
||||||
|
|
||||||
stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
|
stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
|
||||||
.setGestName("PICKING")
|
.setGestName("PICKING")
|
||||||
|
|||||||
@ -29,6 +29,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume
|
|||||||
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
|
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
|
||||||
import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
|
import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
|
||||||
import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
|
import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
|
||||||
|
import it.integry.integrywmsnative.core.settings.SettingsManager;
|
||||||
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
|
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
|
||||||
import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
|
import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
|
||||||
import it.integry.integrywmsnative.core.utility.UtilityDate;
|
import it.integry.integrywmsnative.core.utility.UtilityDate;
|
||||||
@ -435,7 +436,7 @@ public class RettificaGiacenzeViewModel {
|
|||||||
|
|
||||||
|
|
||||||
private void askPostionChange(MtbColt mtbColt, Runnable onComplete) {
|
private void askPostionChange(MtbColt mtbColt, Runnable onComplete) {
|
||||||
if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1) {
|
if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1 || !SettingsManager.iDB().isFlagPositionChangeRequest()) {
|
||||||
onComplete.run();
|
onComplete.run();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -279,8 +279,8 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
|
|||||||
|
|
||||||
var mailRequest = new MailRequestDTO()
|
var mailRequest = new MailRequestDTO()
|
||||||
.setTo("developer@integry.it")
|
.setTo("developer@integry.it")
|
||||||
.setMsgText("Questo è una mail che contiene il log del WMS")
|
.setMsgText("Questa è una mail contenente il log del WMS")
|
||||||
.setSubject("U vuemmeess")
|
.setSubject("Internal WMS log")
|
||||||
.setAttachments(attachmentDTOList);
|
.setAttachments(attachmentDTOList);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user