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

Finish v1.48.00(540)
All checks were successful
WMS - Android (New)/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Marco Elefante 2025-11-18 10:22:02 +01:00
commit 41d77b806f
7 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile.groovy
View File

@ -49,21 +49,21 @@ pipeline {
bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'WMS è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'WMS è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
}
}
}
unstable {
script {
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'WMS è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'WMS è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
}
}
}
failure {
script {
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su WMS', status: 'FAILURE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su WMS', status: 'FAILURE', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
}
}
}

4
app/build.gradle
View File

@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 539
def appVersionName = '1.47.26'
def appVersionCode = 540
def appVersionName = '1.48.00'
signingConfigs {
release {

68
app/src/main/java/it/integry/integrywmsnative/core/model/DtbDoct.java
View File

@ -1,7 +1,7 @@
package it.integry.integrywmsnative.core.model;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.util.List;
public class DtbDoct {
@ -10,7 +10,7 @@ public class DtbDoct {
private String codAnag;
private String codDtip;
private Date dataDoc;
private LocalDate dataDoc;
private Integer numDoc;
private String serDoc;
private BigDecimal acconto;
@ -41,14 +41,14 @@ public class DtbDoct {
private String compilatoDa;
private String userName;
private String controllatoDa;
private Date dataChkDoc;
private Date dataDocVal;
private Date dataInizTrasp;
private Date dataIns;
private Date dataOrd;
private Date dataReg;
private Date dataRifScad;
private Date dataUltMod;
private LocalDate dataChkDoc;
private LocalDate dataDocVal;
private LocalDate dataInizTrasp;
private LocalDate dataIns;
private LocalDate dataOrd;
private LocalDate dataReg;
private LocalDate dataRifScad;
private LocalDate dataUltMod;
private String descrizionePaga;
private String flagPrzScontati;
private String gestione;
@ -89,7 +89,7 @@ public class DtbDoct {
private String targa;
private Integer postiPallet;
private BigDecimal tempMedia;
private Date dataCons;
private LocalDate dataCons;
private BigDecimal nolo;
private BigDecimal nolo2;
private String conducente;
@ -102,7 +102,7 @@ public class DtbDoct {
private String setDataDecorrenza2DataRic;
private BigDecimal totSpese;
private String chkArtListino;
private Date dataCmov;
private LocalDate dataCmov;
private String reso;
private Integer numCmovAutofattura;
private Object dtbTipi;
@ -141,11 +141,11 @@ public class DtbDoct {
return this;
}
public Date getDataDoc() {
public LocalDate getDataDoc() {
return dataDoc;
}
public DtbDoct setDataDoc(Date dataDoc) {
public DtbDoct setDataDoc(LocalDate dataDoc) {
this.dataDoc = dataDoc;
return this;
}
@ -420,74 +420,74 @@ public class DtbDoct {
return this;
}
public Date getDataChkDoc() {
public LocalDate getDataChkDoc() {
return dataChkDoc;
}
public DtbDoct setDataChkDoc(Date dataChkDoc) {
public DtbDoct setDataChkDoc(LocalDate dataChkDoc) {
this.dataChkDoc = dataChkDoc;
return this;
}
public Date getDataDocVal() {
public LocalDate getDataDocVal() {
return dataDocVal;
}
public DtbDoct setDataDocVal(Date dataDocVal) {
public DtbDoct setDataDocVal(LocalDate dataDocVal) {
this.dataDocVal = dataDocVal;
return this;
}
public Date getDataInizTrasp() {
public LocalDate getDataInizTrasp() {
return dataInizTrasp;
}
public DtbDoct setDataInizTrasp(Date dataInizTrasp) {
public DtbDoct setDataInizTrasp(LocalDate dataInizTrasp) {
this.dataInizTrasp = dataInizTrasp;
return this;
}
public Date getDataIns() {
public LocalDate getDataIns() {
return dataIns;
}
public DtbDoct setDataIns(Date dataIns) {
public DtbDoct setDataIns(LocalDate dataIns) {
this.dataIns = dataIns;
return this;
}
public Date getDataOrd() {
public LocalDate getDataOrd() {
return dataOrd;
}
public DtbDoct setDataOrd(Date dataOrd) {
public DtbDoct setDataOrd(LocalDate dataOrd) {
this.dataOrd = dataOrd;
return this;
}
public Date getDataReg() {
public LocalDate getDataReg() {
return dataReg;
}
public DtbDoct setDataReg(Date dataReg) {
public DtbDoct setDataReg(LocalDate dataReg) {
this.dataReg = dataReg;
return this;
}
public Date getDataRifScad() {
public LocalDate getDataRifScad() {
return dataRifScad;
}
public DtbDoct setDataRifScad(Date dataRifScad) {
public DtbDoct setDataRifScad(LocalDate dataRifScad) {
this.dataRifScad = dataRifScad;
return this;
}
public Date getDataUltMod() {
public LocalDate getDataUltMod() {
return dataUltMod;
}
public DtbDoct setDataUltMod(Date dataUltMod) {
public DtbDoct setDataUltMod(LocalDate dataUltMod) {
this.dataUltMod = dataUltMod;
return this;
}
@ -852,11 +852,11 @@ public class DtbDoct {
return this;
}
public Date getDataCons() {
public LocalDate getDataCons() {
return dataCons;
}
public DtbDoct setDataCons(Date dataCons) {
public DtbDoct setDataCons(LocalDate dataCons) {
this.dataCons = dataCons;
return this;
}
@ -969,11 +969,11 @@ public class DtbDoct {
return this;
}
public Date getDataCmov() {
public LocalDate getDataCmov() {
return dataCmov;
}
public DtbDoct setDataCmov(Date dataCmov) {
public DtbDoct setDataCmov(LocalDate dataCmov) {
this.dataCmov = dataCmov;
return this;
}

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

@ -100,7 +100,7 @@ public class DBSettingsModel {
private boolean flagAccettazioneBollaEditableQtaTot = true;
private boolean flagViewSwitchDepoButton = true;
private boolean flagProduzioneSkipAskVersamentoAutomatico;
private boolean flagAccettazioneViewLotto = false;
public boolean isFlagSpedizioneEnableFakeGiacenza() {
return flagSpedizioneEnableFakeGiacenza;
}
@ -843,4 +843,13 @@ public class DBSettingsModel {
this.flagProduzioneSkipAskVersamentoAutomatico = flagProduzioneSkipAskVersamentoAutomatico;
return this;
}
public boolean isFlagAccettazioneViewLotto() {
return flagAccettazioneViewLotto;
}
public DBSettingsModel setFlagAccettazioneViewLotto(boolean flagAccettazioneViewLotto) {
this.flagAccettazioneViewLotto = flagAccettazioneViewLotto;
return this;
}
}

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

@ -254,6 +254,11 @@ public class SettingsManager {
.setSection("ACCETTAZIONE")
.setKeySection("FLAG_DELETE_ROW_ON_CLOSE")
.setSetter(dbSettingsModelIstance::setFlagAccettazioneDeleteRowOnClose));
stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
.setGestName("PICKING")
.setSection("ACCETTAZIONE")
.setKeySection("FLAG_VIEW_LOTTO")
.setSetter(dbSettingsModelIstance::setFlagAccettazioneViewLotto));
stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
.setGestName("PICKING")
.setSection("SPEDIZIONE")

10
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java
View File

@ -36,6 +36,7 @@ public class SitArtOrdDTO {
private String descrizioneEstesaArt;
private String descrizioneEstesaOrd;
private Date dataCons;
private String partitaMag;
public String getDescrizioneEstesaOrd() {
return descrizioneEstesaOrd;
@ -301,4 +302,13 @@ public class SitArtOrdDTO {
this.dataCons = dataCons;
return this;
}
public String getPartitaMag() {
return partitaMag;
}
public SitArtOrdDTO setPartitaMag(String partitaMag) {
this.partitaMag = partitaMag;
return this;
}
}

5
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
View File

@ -273,7 +273,7 @@ public class AccettazioneOrdiniPickingViewModel {
try {
numCollo = UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue());
this.createNewLU(
null,
barcodeScanDTO.getStringValue(),
numCollo,
CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, true, onComplete);
} catch (Exception ex) {
@ -559,6 +559,9 @@ public class AccettazioneOrdiniPickingViewModel {
dataScad = dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita());
}
if (partitaMag == null && SettingsManager.iDB().isFlagAccettazioneViewLotto())
partitaMag = pickingObjectDTO.getSitArtOrdDTO().getPartitaMag();
if (partitaMag == null && dataScad == null) {
HistoryMtbAartDTO historyMtbAartDTO = this.getHistoryItemIfExists(pickingObjectDTO.getMtbAart().getCodMart());