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

Merge branch 'develop'

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-07-28 18:53:00 +02:00
commit d649a68e06
5 changed files with 15 additions and 25 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 { android {
def appVersionCode = 143 def appVersionCode = 144
def appVersionName = '1.12.14' def appVersionName = '1.12.15'
signingConfigs { signingConfigs {
release { release {

18
app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
View File

@ -1,18 +1,10 @@
package it.integry.integrywmsnative.core.model; package it.integry.integrywmsnative.core.model;
import android.os.Parcel;
import android.os.Parcelable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.integrywmsnative.core.utility.UtilityString;
public class MtbColr extends EntityBase { public class MtbColr extends EntityBase {
@ -59,7 +51,7 @@ public class MtbColr extends EntityBase {
private MtbAart mtbAart; private MtbAart mtbAart;
private MtbPartitaMag rifPartitaMag; private MtbPartitaMag mtbPartitaMag;
public MtbColr() { public MtbColr() {
type = "mtb_colr"; type = "mtb_colr";
@ -411,12 +403,12 @@ public class MtbColr extends EntityBase {
} }
public MtbPartitaMag getRifPartitaMag() { public MtbPartitaMag getMtbPartitaMag() {
return rifPartitaMag; return mtbPartitaMag;
} }
public MtbColr setRifPartitaMag(MtbPartitaMag rifPartitaMag) { public MtbColr setMtbPartitaMag(MtbPartitaMag mtbPartitaMag) {
this.rifPartitaMag = rifPartitaMag; this.mtbPartitaMag = mtbPartitaMag;
return this; return this;
} }

11
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
View File

@ -11,7 +11,6 @@ import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.json.JSONObject;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -52,7 +51,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
for (int i = 0; i < mtbColtToSave.getMtbColr().size(); i++) { for (int i = 0; i < mtbColtToSave.getMtbColr().size(); i++) {
mtbColtToSave.getMtbColr().get(i) mtbColtToSave.getMtbColr().get(i)
.setMtbAart(null) .setMtbAart(null)
.setRifPartitaMag(null); .setMtbPartitaMag(null);
} }
EntityRESTConsumer.processEntity(mtbColtToSave, callback, MtbColt.class); EntityRESTConsumer.processEntity(mtbColtToSave, callback, MtbColt.class);
@ -70,7 +69,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
mtbColtToSaveClone.getMtbColr().add( mtbColtToSaveClone.getMtbColr().add(
((MtbColr) mtbColtToSave.getMtbColr().get(i).clone()) ((MtbColr) mtbColtToSave.getMtbColr().get(i).clone())
.setMtbAart(null) .setMtbAart(null)
.setRifPartitaMag(null)); .setMtbPartitaMag(null));
} }
EntityRESTConsumer.processEntity(mtbColtToSaveClone, new ISimpleOperationCallback<MtbColt>() { EntityRESTConsumer.processEntity(mtbColtToSaveClone, new ISimpleOperationCallback<MtbColt>() {
@ -96,7 +95,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
for (int i = 0; i < mtbColt.getMtbColr().size(); i++) { for (int i = 0; i < mtbColt.getMtbColr().size(); i++) {
mtbColt.getMtbColr().get(i) mtbColt.getMtbColr().get(i)
.setMtbAart(null) .setMtbAart(null)
.setRifPartitaMag(null); .setMtbPartitaMag(null);
} }
} }
@ -117,7 +116,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
public static void saveRigaCollo(MtbColr mtbColrToSave, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) { public static void saveRigaCollo(MtbColr mtbColrToSave, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
mtbColrToSave.setMtbAart(null); mtbColrToSave.setMtbAart(null);
mtbColrToSave.setRifPartitaMag(null); mtbColrToSave.setMtbPartitaMag(null);
EntityRESTConsumer.processEntity(mtbColrToSave, new ISimpleOperationCallback<MtbColr>() { EntityRESTConsumer.processEntity(mtbColrToSave, new ISimpleOperationCallback<MtbColr>() {
@Override @Override
@ -681,7 +680,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
public static void creaRettificaCollo(MtbColr sourceMtbColrOriginal, BigDecimal newNumCnf, BigDecimal newQtaTot, Runnable onComplete, RunnableArgs<Exception> onFailed) { public static void creaRettificaCollo(MtbColr sourceMtbColrOriginal, BigDecimal newNumCnf, BigDecimal newQtaTot, Runnable onComplete, RunnableArgs<Exception> onFailed) {
MtbColr sourceMtbColr = (MtbColr) sourceMtbColrOriginal.clone(); MtbColr sourceMtbColr = (MtbColr) sourceMtbColrOriginal.clone();
sourceMtbColr.setRifPartitaMag(null); sourceMtbColr.setMtbPartitaMag(null);
sourceMtbColr.setMtbAart(null); sourceMtbColr.setMtbAart(null);
RettificaULDTO rettificaULDTO = new RettificaULDTO() RettificaULDTO rettificaULDTO = new RettificaULDTO()

3
app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
View File

@ -22,7 +22,6 @@ import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.exception.DateNotRecognizedException; import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException; import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbAart;
import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColr;
@ -76,7 +75,7 @@ public class ProdVersamentoMaterialViewModel {
mMtbColr = mtbColr; mMtbColr = mtbColr;
mBinding.descrArt.setText(mtbColr.getDescrizione()); mBinding.descrArt.setText(mtbColr.getDescrizione());
mBinding.codArt.setText(mtbColr.getCodMart()); mBinding.codArt.setText(mtbColr.getCodMart());
mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getRifPartitaMag() != null) ? " - "+ mtbColr.getRifPartitaMag().getDescrizione() : "")); mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getMtbPartitaMag() != null) ? " - "+ mtbColr.getMtbPartitaMag().getDescrizione() : ""));
if (!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())) { if (!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())) {
String text = UtilityNumber.decimalToString(mtbColr.getQtaCol()); String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());

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

@ -655,7 +655,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
MtbColr matchRow = matchWithPartitaMag.get(k); MtbColr matchRow = matchWithPartitaMag.get(k);
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
.setMtbPartitaMag(matchRow.getRifPartitaMag()) .setMtbPartitaMag(matchRow.getMtbPartitaMag())
.setNumCnf(matchRow.getNumCnf()) .setNumCnf(matchRow.getNumCnf())
.setQtaCnf(matchRow.getQtaCnf()) .setQtaCnf(matchRow.getQtaCnf())
.setQtaTot(matchRow.getQtaCol()) .setQtaTot(matchRow.getQtaCol())
@ -678,7 +678,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
MtbColr matchRow = matchWithColloRow.get(k); MtbColr matchRow = matchWithColloRow.get(k);
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
.setMtbPartitaMag(matchRow.getRifPartitaMag()) .setMtbPartitaMag(matchRow.getMtbPartitaMag())
.setNumCnf(matchRow.getNumCnf()) .setNumCnf(matchRow.getNumCnf())
.setQtaCnf(matchRow.getQtaCnf()) .setQtaCnf(matchRow.getQtaCnf())
.setQtaTot(matchRow.getQtaCol()) .setQtaTot(matchRow.getQtaCol())