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

Gestita dataconsegna nella distribuzione collo

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-07-22 09:27:41 +02:00
parent e796730937
commit 7a44054f9e
6 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/app.xml generated
View File

@ -6,7 +6,7 @@
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_ime,dynamic_vgalimenti" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="true" />

27
app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
View File

@ -8,6 +8,7 @@ public class FiltroOrdineDTO {
private String gestioneOrd;
private String dataOrd;
private String dataCons;
private int numOrd;
public String getGestioneOrd() {
@ -39,6 +40,32 @@ public class FiltroOrdineDTO {
return this;
}
public String getDataConsS() {
return dataCons;
}
public Date getDataConsD() throws ParseException {
try {
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
return sdf.parse(getDataConsS());
} catch (Exception ex) {
return null;
}
}
public FiltroOrdineDTO setDataCons(String dataCons) {
this.dataCons = dataCons;
return this;
}
public FiltroOrdineDTO setDataCons(Date dataCons) {
if(dataCons != null) {
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
this.dataCons = sdf.format(dataCons);
}
return this;
}
public int getNumOrd() {
return numOrd;
}

11
app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
View File

@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.model;
import androidx.databinding.ObservableArrayList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.math.BigDecimal;
@ -16,6 +15,7 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityDB;
import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.integrywmsnative.core.utility.UtilityString;
/**
* Created by GiuseppeS on 06/03/2018.
@ -496,11 +496,18 @@ public class MtbColt extends EntityBase {
FiltroOrdineDTO x = filtroOrdineDtos.get(i);
try {
whereCond.append(String.format("(dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s and dtb_ordt.num_ord = %s)",
whereCond.append("(");
whereCond.append(String.format("dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s and dtb_ordt.num_ord = %s",
UtilityDB.valueToString(x.getGestioneOrd()),
UtilityDB.valueToString(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
UtilityDB.valueToString(x.getNumOrd())));
if(!UtilityString.isNullOrEmpty(x.getDataConsS())) {
whereCond.append(String.format(" AND dtb_ordr.data_cons = %s",
UtilityDB.valueToString(UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
}
whereCond.append(")");
if(i < filtroOrdineDtos.size()-1) {
whereCond.append(" OR ");
}

10
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
View File

@ -859,7 +859,11 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
if(ean128Model.Count != null && ean128Model.Count > 0) {
//if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
dto.setNumCnf(ean128Model.Count);
dto.setQtaTot(new BigDecimal(ean128Model.Count));
if(!item.getMtbAart().isFlagQtaCnfFissa()) {
dto.setQtaCnf(new BigDecimal(ean128Model.Count));
}
//} else {
// dto.setQtaTot(new BigDecimal(ean128Model.Count));
//}
@ -902,6 +906,10 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
.setCodJcom(item.getCodJcom())
.setRigaOrd(item.getRigaOrd());
if(!item.getMtbAart().isFlagQtaCnfFissa()) {
mtbColr.setQtaCnf(quantityDTO.qtaCnf.getBigDecimal());
}
mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
MtbColt cloneMtbColt = (MtbColt) mArticoliInColloBottomSheetViewModel.mtbColt.get().clone();

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java
View File

@ -112,7 +112,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
holder.binding.getRoot().setOnClickListener(v -> {
// ordine.setSelected(!ordine.isSelected());
});

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

@ -202,7 +202,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
FiltroOrdineDTO filtro = new FiltroOrdineDTO()
.setDataOrd(x.getDataOrdD())
.setNumOrd(x.getNumOrd())
.setGestioneOrd(x.getGestione());
.setGestioneOrd(x.getGestione())
.setDataCons(x.getDataConsD());
if(!defaultFiltroOrdine.contains(filtro)) defaultFiltroOrdine.add(filtro);
});