diff --git a/.idea/runConfigurations/app_agricoper.xml b/.idea/runConfigurations/app_agricoper.xml deleted file mode 100644 index 5736eb4f..00000000 --- a/.idea/runConfigurations/app_agricoper.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/app_frudis.xml b/.idea/runConfigurations/app_frudis.xml deleted file mode 100644 index 802d974d..00000000 --- a/.idea/runConfigurations/app_frudis.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/app_gramm.xml b/.idea/runConfigurations/app_gramm.xml deleted file mode 100644 index 1438cfb0..00000000 --- a/.idea/runConfigurations/app_gramm.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/app_ime.xml b/.idea/runConfigurations/app_ime.xml deleted file mode 100644 index 4665b87a..00000000 --- a/.idea/runConfigurations/app_ime.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/app_saporiveri.xml b/.idea/runConfigurations/app_saporiveri.xml deleted file mode 100644 index 969d5409..00000000 --- a/.idea/runConfigurations/app_saporiveri.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/app_saporiveri_pv.xml b/.idea/runConfigurations/app_saporiveri_pv.xml deleted file mode 100644 index 8c8e7471..00000000 --- a/.idea/runConfigurations/app_saporiveri_pv.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 52cb3ed7..513e03c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,7 @@ android { abortOnError false } - dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv", ":dynamic_saporiveri", ':dynamic_gramm', ':dynamic_agricoper'] + dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti"] } diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java index 1d72f32c..4bb1cddb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java @@ -69,8 +69,8 @@ public class MainApplicationModule { @Provides @Singleton - OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) { - return new OrdiniRESTConsumer(systemRESTConsumer); + OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) { + return new OrdiniRESTConsumer(systemRESTConsumer, entityRESTConsumer); } @Provides diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index 673b0e2d..a73a097f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java @@ -53,6 +53,8 @@ public class MtbColr extends EntityBase { private MtbAart mtbAart; private MtbPartitaMag mtbPartitaMag; + + private transient int id; private transient MtbColr refMtbColr; public MtbColr() { @@ -516,6 +518,15 @@ public class MtbColr extends EntityBase { return this; } + public int getId() { + return id; + } + + public MtbColr setId(int id) { + this.id = id; + return this; + } + public MtbColr getRefMtbColr() { return refMtbColr; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbPartitaMag.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbPartitaMag.java index d54a04a2..f677fc1b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbPartitaMag.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbPartitaMag.java @@ -5,7 +5,7 @@ import java.util.Date; import it.integry.integrywmsnative.core.utility.UtilityDate; -public class MtbPartitaMag { +public class MtbPartitaMag extends EntityBase{ private String codMart; private String partitaMag; @@ -30,6 +30,10 @@ public class MtbPartitaMag { private String partitaMagSec; private BigDecimal qtaAttesa; + public MtbPartitaMag() { + this.type = "mtb_partita_mag"; + } + public String getCodMart() { return codMart; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index c1164e65..c9bf2a9e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -96,17 +96,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { } } - this.mEntityRESTConsumer.processEntityList(mtbColtsToSave, new ISimpleOperationCallback>() { - @Override - public void onSuccess(List value) { - if (onComplete != null) onComplete.run(value); - } - - @Override - public void onFailed(Exception ex) { - if (onFailed != null) onFailed.run(ex); - } - }, true, MtbColt.class); + this.mEntityRESTConsumer.processEntityList(mtbColtsToSave, true, MtbColt.class, onComplete, onFailed); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java index 0d3a4fee..832f293d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java @@ -66,11 +66,11 @@ public class EntityRESTConsumer extends _BaseRESTConsumer { } - public void processEntityList(List entitiesToSave, final ISimpleOperationCallback> callback, boolean singleTransaction, Class type) { + public void processEntityList(List entitiesToSave, boolean singleTransaction, Class type, final RunnableArgs> onComplete, final RunnableArgs onFailed) { RunnableArgs tmpFailed = ex -> { // UtilityExceptions.defaultException(null, ex); - if (callback != null) callback.onFailed(ex); + if (onFailed != null) onFailed.run(ex); }; EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class); @@ -99,7 +99,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer { } } - callback.onSuccess(responseList); + onComplete.run(responseList); } else { Log.e("EntityRESTConsumer", response.message()); tmpFailed.run(new Exception(response.message())); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java index 2b34d719..94ed5c74 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.core.rest.consumers; +import com.annimon.stream.Optional; import com.annimon.stream.Stream; import com.google.gson.reflect.TypeToken; import com.orhanobut.logger.Logger; @@ -8,22 +9,27 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Random; import javax.inject.Singleton; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.model.CommonModelConsts; +import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; +import it.integry.integrywmsnative.core.model.MtbPartitaMag; import it.integry.integrywmsnative.core.model.OrdineInevasoDTO; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO; +import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; import it.integry.integrywmsnative.core.utility.UtilityQuery; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; -import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO; -import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -32,9 +38,11 @@ import retrofit2.Response; public class OrdiniRESTConsumer extends _BaseRESTConsumer { private final SystemRESTConsumer mSystemRESTConsumer; + private final EntityRESTConsumer mEntityRESTConsumer; - public OrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) { + public OrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) { this.mSystemRESTConsumer = systemRESTConsumer; + this.mEntityRESTConsumer = entityRESTConsumer; } public void getSuggestedPickingList(String codMdep, List sitArtOrdList, RunnableArgs> onComplete, RunnableArgs onFailed) { @@ -43,10 +51,59 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { service .getSuggestedPickingList(codMdep, sitArtOrdList) - .enqueue(new Callback>>() { + .enqueue(new Callback<>() { @Override public void onResponse(Call>> call, Response>> response) { - analyzeAnswer(response, "getSuggestedPickingList", onComplete, onFailed); + analyzeAnswer(response, "getSuggestedPickingList", pickingObjects -> { + List batchLotsToSearch = new ArrayList<>(); + + for (PickingObjectDTO pickingObjectDTO : pickingObjects) { + for (MtbColt mtbColt : pickingObjectDTO.getMtbColts()) { + Stream.of(mtbColt.getMtbColr()) + .filter(x -> !UtilityString.isNullOrEmpty(x.getPartitaMag())) + .forEach(x -> { + + if (!Stream.of(batchLotsToSearch).anyMatch(batchLotToSearch -> batchLotToSearch.getCodMart().equalsIgnoreCase(x.getCodMart()) && batchLotToSearch.getPartitaMag().equalsIgnoreCase(x.getPartitaMag()))) { + MtbPartitaMag mtbPartitaMag = new MtbPartitaMag() + .setCodMart(x.getCodMart()) + .setPartitaMag(x.getPartitaMag()); + + mtbPartitaMag.setOperation(CommonModelConsts.OPERATION.SELECT_OBJECT); + mtbPartitaMag.setOnlyPkMaster(false); + + batchLotsToSearch.add(mtbPartitaMag); + } + }); + } + } + + Random rand = new Random(); + + + retrievePartiteMag(batchLotsToSearch, partite -> { + + for (PickingObjectDTO pickingObjectDTO : pickingObjects) { + for (MtbColt mtbColt : pickingObjectDTO.getMtbColts()) { + for (MtbColr mtbColr : mtbColt.getMtbColr()) { + + mtbColr.setId(rand.nextInt()); + + Optional optionalMtbPartitaMag = Stream.of(partite) + .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()) + && (!UtilityString.isNullOrEmpty(x.getPartitaMag()) && x.getPartitaMag().equalsIgnoreCase(mtbColr.getPartitaMag()))) + .findFirst(); + + if (optionalMtbPartitaMag.isPresent()) mtbColr.setMtbPartitaMag(optionalMtbPartitaMag.get()); + } + } + } + + onComplete.run(pickingObjects); + + }, onFailed); + + + }, onFailed); } @Override @@ -58,6 +115,11 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { } + private void retrievePartiteMag(List partitaMag, RunnableArgs> onComplete, RunnableArgs onFailed) { + + this.mEntityRESTConsumer.processEntityList(partitaMag, true, MtbPartitaMag.class, onComplete, onFailed); + } + public void getOrdiniInevasi(String codMdep, GestioneEnum gestione, RunnableArgs> onComplete, RunnableArgs onFailed) { OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class); @@ -67,18 +129,18 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { @Override public void onResponse(Call>> call, Response>> response) { analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> { - if(responseDtoList == null) responseDtoList = new ArrayList<>(); + if (responseDtoList == null) responseDtoList = new ArrayList<>(); onComplete.run(responseDtoList); }, ex -> { Logger.e(ex, "Errore durante il caricamento degli ordini di lavorazione"); - if(onFailed != null) onFailed.run(ex); + if (onFailed != null) onFailed.run(ex); }); } @Override public void onFailure(Call>> call, Throwable t) { Logger.e(t, "Errore durante il caricamento degli ordini di lavorazione"); - if(onFailed != null) onFailed.run(new Exception(t)); + if (onFailed != null) onFailed.run(new Exception(t)); } }); } @@ -113,7 +175,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { public void getBancaliGiaRegistrati(List orders, GestioneEnum gestione, int segno, RunnableArgs> onComplete, RunnableArgs onFailed) { String whereCondGestione = ""; - if(gestione != null) { + if (gestione != null) { whereCondGestione = "mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " "; } else { whereCondGestione = "(mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') "; @@ -142,12 +204,13 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { baseSql += "(" + UtilityQuery.concatFieldListInWhereCond(whereCondMapList) + ")"; - Type typeOfObjectsList = new TypeToken>() {}.getType(); + Type typeOfObjectsList = new TypeToken>() { + }.getType(); this.mSystemRESTConsumer.>processSql(baseSql, typeOfObjectsList, value -> { - if(onComplete != null) onComplete.run(value); - }, ex -> { - if(onFailed != null) onFailed.run(ex); - }); + if (onComplete != null) onComplete.run(value); + }, ex -> { + if (onFailed != null) onFailed.run(ex); + }); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index adc66c27..b43a9e68 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -568,6 +568,7 @@ public class RettificaGiacenzeViewModel { this.mAnyEditDone = true; this.sendOnRowSaved(); + this.sendOnLoadingEnded(); }, this::sendError ); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index d26cefbd..51bc7754 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -263,12 +263,12 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo this.mBindings.spedizionePickingList.setAdapter(spedizioneListAdapter); this.mBindings.spedizionePickingList.setLayoutManager(new LinearLayoutManager(this)); - spedizioneListAdapter.setOnItemClicked((clickedItem, refMtbColt) -> { + spedizioneListAdapter.setOnItemClicked((clickedItem, refMtbColt, refMtbColr) -> { if (!noLUPresent.get() && ((SettingsManager.iDB().isFlagSpedizioneEnableManualPick() && clickedItem.getSitArtOrdDTO().isFlagEnablePickManuale()) || clickedItem.getTempPickData() != null)) { - this.mViewmodel.dispatchOrdineRow(clickedItem, refMtbColt, + this.mViewmodel.dispatchOrdineRow(clickedItem, refMtbColt, refMtbColr, SettingsManager.iDB().isFlagSpedizioneEnableManualPick() && clickedItem.getSitArtOrdDTO().isFlagEnablePickManuale()); } }); @@ -363,6 +363,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag())); cloneModel.setBadge2(mtbColrToDispatch.getCodJcom()); } + cloneModel.setSourceMtbColr(mtbColrToDispatch); cloneModel.setSubDescrizione2(String.format(getString(R.string.lu_number_data_text), mtbColtToPick.getNumCollo(), UtilityDate.formatDate(mtbColtToPick.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN))); @@ -379,14 +380,14 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo numCnfOrdCounter = numCnfOrdCounter.subtract(numCnfOrdToSubstract); BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) - .filter(y -> y.getRefMtbColr() != null && + .filter(y -> y.getRefMtbColr() != null &&/* y.getRefMtbColr().getNumCollo().equals(mtbColrToDispatch.getNumCollo()) && y.getRefMtbColr().getDataColloD().equals(mtbColrToDispatch.getDataColloD()) && y.getRefMtbColr().getSerCollo().equals(mtbColrToDispatch.getSerCollo()) && y.getRefMtbColr().getGestioneEnum().equals(mtbColrToDispatch.getGestioneEnum()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodMart(), mtbColrToDispatch.getCodMart()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodTagl(), mtbColrToDispatch.getCodTagl()) && - UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())) + UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())*/ y.getRefMtbColr().equals(mtbColrToDispatch)) .map(MtbColr::getNumCnf) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -404,13 +405,15 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) .filter(y -> y.getRefMtbColr() != null && + y.getRefMtbColr().getId() == mtbColrToDispatch.getId() + /* y.getRefMtbColr().getNumCollo().equals(mtbColrToDispatch.getNumCollo()) && y.getRefMtbColr().getDataColloD().equals(mtbColrToDispatch.getDataColloD()) && y.getRefMtbColr().getSerCollo().equals(mtbColrToDispatch.getSerCollo()) && y.getRefMtbColr().getGestioneEnum().equals(mtbColrToDispatch.getGestioneEnum()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodMart(), mtbColrToDispatch.getCodMart()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodTagl(), mtbColrToDispatch.getCodTagl()) && - UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())) + UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())*/) .map(MtbColr::getQtaCol) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -528,6 +531,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag())); cloneModel.setBadge2(mtbColrToDispatch.getCodJcom()); } + cloneModel.setSourceMtbColr(mtbColrToDispatch); cloneModel.setSubDescrizione2(String.format(getString(R.string.lu_number_data_text), mtbColtToPick.getNumCollo(), UtilityDate.formatDate(mtbColtToPick.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN))); @@ -545,13 +549,14 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) .filter(y -> y.getRefMtbColr() != null && + y.getRefMtbColr().getId() == mtbColrToDispatch.getId() /* y.getRefMtbColr().getNumCollo().equals(mtbColrToDispatch.getNumCollo()) && y.getRefMtbColr().getDataColloD().equals(mtbColrToDispatch.getDataColloD()) && y.getRefMtbColr().getSerCollo().equals(mtbColrToDispatch.getSerCollo()) && y.getRefMtbColr().getGestioneEnum().equals(mtbColrToDispatch.getGestioneEnum()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodMart(), mtbColrToDispatch.getCodMart()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodTagl(), mtbColrToDispatch.getCodTagl()) && - UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())) + UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())*/) .map(MtbColr::getNumCnf) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -567,13 +572,14 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) .filter(y -> y.getRefMtbColr() != null && + y.getRefMtbColr().getId() == mtbColrToDispatch.getId() /* y.getRefMtbColr().getNumCollo().equals(mtbColrToDispatch.getNumCollo()) && y.getRefMtbColr().getDataColloD().equals(mtbColrToDispatch.getDataColloD()) && y.getRefMtbColr().getSerCollo().equals(mtbColrToDispatch.getSerCollo()) && y.getRefMtbColr().getGestioneEnum().equals(mtbColrToDispatch.getGestioneEnum()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodMart(), mtbColrToDispatch.getCodMart()) && UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodTagl(), mtbColrToDispatch.getCodTagl()) && - UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())) + UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol())*/) .map(MtbColr::getQtaCol) .reduce(BigDecimal.ZERO, BigDecimal::add); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index d557362a..93e26713 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -742,7 +742,7 @@ public class SpedizioneViewModel { this.sendFilterApplied(null); this.getPickingList().postValue(pickingList); } else { - this.dispatchOrdineRow(matchedItem, matchedItem.getRefMtbColt(), false); + this.dispatchOrdineRow(matchedItem, matchedItem.getRefMtbColt(), matchedItem.getRefMtbColt().getMtbColr().get(0), false); } } else { @@ -761,9 +761,11 @@ public class SpedizioneViewModel { } - public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, boolean canPartitaMagBeChanged) { + public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, boolean canPartitaMagBeChanged) { //TODO: Al posto di prelevare la prima riga bisognerebbe controllare se c'è ne una che corrisponde con la partita richiesta +// MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null; + if (pickingObjectDTO.getTempPickData() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt() != null && @@ -771,30 +773,46 @@ public class SpedizioneViewModel { List scannedMtbColrs = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr(); - List availableBatchLot = Stream.of(scannedMtbColrs) + List availableBatchLots = Stream.of(scannedMtbColrs) .filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) && ( - x.getPartitaMag() == null || UtilityString.isNullOrEmpty(x.getMtbPartitaMag().getDataScadS()) || UtilityDate.getDateInstance().before(x.getMtbPartitaMag().getDataScadD()) + x.getPartitaMag() == null || + UtilityString.isNullOrEmpty(x.getMtbPartitaMag().getDataScadS()) || + UtilityDate.getDateInstance().before(x.getMtbPartitaMag().getDataScadD()) )) .distinctBy(MtbColr::getPartitaMag) .map(x -> x.getPartitaMag() == null ? new MtbPartitaMag().setCodMart(x.getMtbAart().getCodMart()) : x.getMtbPartitaMag()) .toList(); - if(availableBatchLot.size() > 1) { + //Controllo se una delle partite combacia con quella che voglio evadere + if(refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) { + MtbPartitaMag refMtbPartitaMag = refMtbColr.getMtbPartitaMag(); + + Optional matchPartitaMag = Stream.of(availableBatchLots) + .filter(availableBatchLot -> refMtbPartitaMag.getPartitaMag().equalsIgnoreCase(availableBatchLot.getPartitaMag())) + .findFirst(); + + if(matchPartitaMag.isPresent()) { + availableBatchLots.clear(); + availableBatchLots.add(refMtbPartitaMag); + } + } + + if(availableBatchLots.size() > 1) { this.sendOnLoadingStarted(); List tmp = new ArrayList<>(); - if(Stream.of(availableBatchLot).anyMatch(x -> !UtilityString.isNullOrEmpty(x.getDataScadS()))) { + if(Stream.of(availableBatchLots).anyMatch(x -> !UtilityString.isNullOrEmpty(x.getDataScadS()))) { tmp.addAll( - Stream.of(availableBatchLot) + Stream.of(availableBatchLots) .filter(x -> !UtilityString.isNullOrEmpty(x.getDataScadS()) && UtilityDate.getDateInstance().before(x.getDataScadD())) .sortBy(MtbPartitaMag::getDataScadD) .toList()); } - if(Stream.of(availableBatchLot).anyMatch(x -> UtilityString.isNullOrEmpty(x.getDataScadS()))) { + if(Stream.of(availableBatchLots).anyMatch(x -> UtilityString.isNullOrEmpty(x.getDataScadS()))) { tmp.addAll( - Stream.of(availableBatchLot) + Stream.of(availableBatchLots) .filter(x -> UtilityString.isNullOrEmpty(x.getDataScadS())) .sortBy(MtbPartitaMag::getPartitaMag) .toList()); @@ -811,22 +829,22 @@ public class SpedizioneViewModel { .toList() .get(0); - dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, scannedMtbColr, canPartitaMagBeChanged); + dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColr, canPartitaMagBeChanged); } }); } else { - dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, scannedMtbColrs.get(0), canPartitaMagBeChanged); + dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColrs.get(0), canPartitaMagBeChanged); } } else { - dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, null, canPartitaMagBeChanged); + dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, null, canPartitaMagBeChanged); } } - private void dispatchOrdineRowOnPostBatchLotSelection(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr scannedMtbColr, boolean canPartitaMagBeChanged) { + private void dispatchOrdineRowOnPostBatchLotSelection(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, MtbColr scannedMtbColr, boolean canPartitaMagBeChanged) { BigDecimal totalQtaOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaOrd(); BigDecimal totalNumCnfOrd = pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd(); BigDecimal qtaCnfOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaCnfOrd(); @@ -864,45 +882,48 @@ public class SpedizioneViewModel { refMtbColt = pickingObjectDTO.getMtbColts().get(0); } - MtbColr refMtbColr = null; +// MtbColr refMtbColr = null; +// +// if (scannedMtbColr != null && refMtbColt != null && refMtbColt.getMtbColr().size() > 0) { +// Optional optionalMtbColr = Stream.of(refMtbColt.getMtbColr()) +// .filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) && +// UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) && +// UtilityString.equalsIgnoreCase(y.getCodCol(), scannedMtbColr.getCodCol()) && +// (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(y.getPartitaMag(), scannedMtbColr.getPartitaMag()) || UtilityString.isNullOrEmpty(scannedMtbColr.getPartitaMag()))) +// .findFirst(); +// +// if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get(); +// } - if (scannedMtbColr != null && refMtbColt != null && refMtbColt.getMtbColr().size() > 0) { - Optional optionalMtbColr = Stream.of(refMtbColt.getMtbColr()) - .filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) && - UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) && - UtilityString.equalsIgnoreCase(y.getCodCol(), scannedMtbColr.getCodCol()) && - (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(y.getPartitaMag(), scannedMtbColr.getPartitaMag()) || UtilityString.isNullOrEmpty(scannedMtbColr.getPartitaMag()))) - .findFirst(); - if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get(); - } - - MtbColr mtbColrToUse = scannedMtbColr != null ? scannedMtbColr : refMtbColr; - - if (mtbColrToUse != null) { + if(refMtbColr != null) { if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) { - if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getQtaCol(), qtaDaEvadere)) { - numCnfDaPrelevare = mtbColrToUse.getNumCnf(); - qtaColDaPrelevare = mtbColrToUse.getQtaCol(); + if (UtilityBigDecimal.equalsOrLowerThan(refMtbColr.getQtaCol(), qtaDaEvadere)) { + numCnfDaPrelevare = refMtbColr.getNumCnf(); + qtaColDaPrelevare = refMtbColr.getQtaCol(); } else { numCnfDaPrelevare = numCnfDaEvadere; qtaColDaPrelevare = qtaDaEvadere; } - qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf(); + qtaCnfDaPrelevare = refMtbColr.getQtaCnf(); } else { - if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getNumCnf(), numCnfDaEvadere)) { - numCnfDaPrelevare = mtbColrToUse.getNumCnf(); - qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf(); - qtaColDaPrelevare = mtbColrToUse.getQtaCol(); + if (UtilityBigDecimal.equalsOrLowerThan(refMtbColr.getNumCnf(), numCnfDaEvadere)) { + numCnfDaPrelevare = refMtbColr.getNumCnf(); + qtaCnfDaPrelevare = refMtbColr.getQtaCnf(); + qtaColDaPrelevare = refMtbColr.getQtaCol(); } else { numCnfDaPrelevare = numCnfDaEvadere; qtaColDaPrelevare = qtaDaEvadere; qtaCnfDaPrelevare = qtaCnfDaEvadere; } } + } + MtbColr mtbColrToUse = scannedMtbColr != null ? scannedMtbColr : refMtbColr; + if (mtbColrToUse != null) { + totalQtaAvailable = mtbColrToUse.getQtaCol(); totalNumCnfAvailable = mtbColrToUse.getNumCnf(); qtaCnfAvailable = mtbColrToUse.getQtaCnf(); @@ -1344,7 +1365,7 @@ public class SpedizioneViewModel { .setDatetimeRow(UtilityDate.getDateInstance()); //TODO: Al posto di prelevare la prima riga bisognerebbe controllare se c'è ne una che corrisponde con la partita richiesta - MtbColr mtbColrToDispatch = pickingObjectDTO.getTempPickData() != null && + final MtbColr mtbColrToDispatch = pickingObjectDTO.getTempPickData() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr() != null && pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().size() > 0 ? @@ -1400,7 +1421,6 @@ public class SpedizioneViewModel { shouldPrint = false; } - if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) { resetMatchedRows(); this.sendOnLoadingEnded(); @@ -1430,6 +1450,15 @@ public class SpedizioneViewModel { .setCodCol(mtbColr.getCodCol()); if (refMtbColt != null) { + + MtbColr originalRefMtbColr = refMtbColt.getMtbColr() != null && + refMtbColt.getMtbColr().size() > 0 ? + refMtbColt.getMtbColr().get(0) : null; + + if(originalRefMtbColr != null) { + refMtbColr.setId(originalRefMtbColr.getId()); + } + refMtbColr .setNumCollo(refMtbColt.getNumCollo()) .setDataCollo(refMtbColt.getDataColloS()) @@ -1557,10 +1586,8 @@ public class SpedizioneViewModel { public void closeLU(boolean shouldPrint) { if (mCurrentMtbColt == null) return; - this.sendOnLoadingStarted(); - mColliMagazzinoRESTConsumer.canLUBeDeleted(mCurrentMtbColt, canBeDeleted -> { if (canBeDeleted) { @@ -1641,12 +1668,8 @@ public class SpedizioneViewModel { } }); } - } - }, this::sendError); - - } private void distribuisciLU(RunnableArgs> onComplete) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java index 16ad0f55..68fa2471 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java @@ -24,7 +24,8 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback; import it.integry.integrywmsnative.core.expansion.OnSingleClickListener; -import it.integry.integrywmsnative.core.expansion.RunnableArgss; +import it.integry.integrywmsnative.core.expansion.RunnableArgsss; +import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityNumber; @@ -41,7 +42,7 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter mDataset = new ArrayList<>(); - private RunnableArgss mOnItemClicked; + private RunnableArgsss mOnItemClicked; static class SubheaderHolder extends RecyclerView.ViewHolder { @@ -81,7 +82,7 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter onItemClicked) { + public void setOnItemClicked(RunnableArgsss onItemClicked) { this.mOnItemClicked = onItemClicked; } @@ -159,7 +160,7 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter { if (this.mOnItemClicked != null) - this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel(), pickingObjectDTO.getSourceMtbColt()); + this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel(), pickingObjectDTO.getSourceMtbColt(), pickingObjectDTO.getSourceMtbColr()); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListModel.java index 8e8181e9..43269d14 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListModel.java @@ -4,6 +4,7 @@ import org.jetbrains.annotations.NotNull; import java.math.BigDecimal; +import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; @@ -26,6 +27,7 @@ public class SpedizioneListModel implements Cloneable { private PickingObjectDTO mOriginalModel; private MtbColt mSourceMtbColt; + private MtbColr mSourceMtbColr; @NotNull @Override @@ -153,4 +155,13 @@ public class SpedizioneListModel implements Cloneable { this.mSourceMtbColt = sourceMtbColt; return this; } + + public MtbColr getSourceMtbColr() { + return mSourceMtbColr; + } + + public SpedizioneListModel setSourceMtbColr(MtbColr sourceMtbColr) { + this.mSourceMtbColr = sourceMtbColr; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java index 2a7d8fb1..005653d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.view.dialogs.choose_batch_lot; import android.content.Context; +import android.content.DialogInterface; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -32,14 +33,12 @@ public class DialogChooseBatchLotView extends BaseDialogFragment { @Inject DialogChooseBatchLotViewModel mViewModel; - private List mAvailableBatchLot; - private RunnableArgs mOnItemSelected; + private final List mAvailableBatchLot; + private final RunnableArgs mOnItemSelected; private Context mContext; private DialogChooseBatchLotBinding mBindings; - private DialogChooseBatchLotAdapter mAdapter; - private MtbPartitaMag mSelectedItem; public static DialogChooseBatchLotView newInstance(List availableBatchLot, RunnableArgs onItemSelected) { @@ -82,8 +81,8 @@ public class DialogChooseBatchLotView extends BaseDialogFragment { } @Override - public void dismiss() { - super.dismiss(); + public void onDismiss(@NonNull DialogInterface dialog) { + super.onDismiss(dialog); if(mOnItemSelected != null) { this.mOnItemSelected.run(mSelectedItem); @@ -99,7 +98,7 @@ public class DialogChooseBatchLotView extends BaseDialogFragment { itemDecorator.setDrawable(ContextCompat.getDrawable(mContext, R.drawable.divider)); mBindings.mainList.addItemDecoration(itemDecorator); - mAdapter = new DialogChooseBatchLotAdapter(mAvailableBatchLot, onItemClicked); + DialogChooseBatchLotAdapter mAdapter = new DialogChooseBatchLotAdapter(mAvailableBatchLot, onItemClicked); mBindings.mainList.setAdapter(mAdapter); } diff --git a/build_all.bat b/build_all.bat index 6c731ebe..94ac1622 100644 --- a/build_all.bat +++ b/build_all.bat @@ -1,8 +1,2 @@ call build_azienda.bat _base -call build_azienda.bat agricoper -call build_azienda.bat frudis -call build_azienda.bat gramm -call build_azienda.bat ime -call build_azienda.bat saporiveri_pv -call build_azienda.bat saporiveri call build_azienda.bat vgalimenti \ No newline at end of file diff --git a/dynamic_agricoper/.gitignore b/dynamic_agricoper/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/dynamic_agricoper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/dynamic_agricoper/build.gradle b/dynamic_agricoper/build.gradle deleted file mode 100644 index f0211172..00000000 --- a/dynamic_agricoper/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id 'com.android.dynamic-feature' -} -android { - compileSdk 30 - - defaultConfig { - minSdk 21 - targetSdk 30 - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':app') - - implementation 'androidx.appcompat:appcompat:1.2.0' -} diff --git a/dynamic_agricoper/src/androidTest/java/it/integry/wms/dynamic_customization/ExampleInstrumentedTest.java b/dynamic_agricoper/src/androidTest/java/it/integry/wms/dynamic_customization/ExampleInstrumentedTest.java deleted file mode 100644 index 32e9a1db..00000000 --- a/dynamic_agricoper/src/androidTest/java/it/integry/wms/dynamic_customization/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("it.integry.wms.dynamic_customization", appContext.getPackageName()); - } -} \ No newline at end of file diff --git a/dynamic_agricoper/src/main/AndroidManifest.xml b/dynamic_agricoper/src/main/AndroidManifest.xml deleted file mode 100644 index b2892323..00000000 --- a/dynamic_agricoper/src/main/AndroidManifest.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java deleted file mode 100644 index ebaa46ce..00000000 --- a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ /dev/null @@ -1,29 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import android.content.Context; -import android.util.Log; - -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; - -public class DynamicContext { - - public void init(Context context) { - Log.d("DynamicContext", "Caricamento personalizzazioni per Azienda Agricoper"); - - try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); - } catch (Exception ex) { - UtilityExceptions.defaultException(context, ex); - } - - Log.d("DynamicContext", "Caricamento personalizzazioni per Azienda Agricoper COMPLETATO"); - - } - -} diff --git a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java deleted file mode 100644 index e5d3efbf..00000000 --- a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ /dev/null @@ -1,12 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; -import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; - -public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration { - - public CustomConfiguration() { - configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationAGRICOPER()); - } - -} diff --git a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 77adb537..00000000 --- a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - @Override - public boolean shoudShowCodMdepFilter() { - return false; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return false; - } - - @Override - public boolean shoudShowAgenteFilter() { - return false; - } -} diff --git a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationAGRICOPER.java b/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationAGRICOPER.java deleted file mode 100644 index ab851f87..00000000 --- a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationAGRICOPER.java +++ /dev/null @@ -1,53 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; -import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment; -import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; -import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment; - -public class MenuConfigurationAGRICOPER extends BaseMenuConfiguration { - - public MenuConfigurationAGRICOPER() { - - - - this - .addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.manufacture) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_produzione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_rientro_merce) - .setTitleText(it.integry.integrywmsnative.R.string.rientro_merce_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(ProdRientroMerceFragment::newInstance)) - - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.internal_handling) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce) - .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) - .setFragmentFactory(VersamentoMerceFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze) - .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box) - .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) - - - ); - - - - } - -} diff --git a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java deleted file mode 100644 index e5c916e6..00000000 --- a/dynamic_agricoper/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,23 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; -import it.integry.integrywmsnative.core.settings.SettingsManager; - -public class OrdiniVendita implements IOrdiniVendita { - - - @Override - public void distribuisciCollo(MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { -// UtilityToast.showToast("Avviato metodo in BaseFeature"); - - ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), - onComplete, - onFailed); - } -} diff --git a/dynamic_agricoper/src/test/java/it/integry/wms/dynamic_customization/ExampleUnitTest.java b/dynamic_agricoper/src/test/java/it/integry/wms/dynamic_customization/ExampleUnitTest.java deleted file mode 100644 index 1e97227b..00000000 --- a/dynamic_agricoper/src/test/java/it/integry/wms/dynamic_customization/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/dynamic_frudis/.gitignore b/dynamic_frudis/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/dynamic_frudis/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/dynamic_frudis/build.gradle b/dynamic_frudis/build.gradle deleted file mode 100644 index 8c659f3a..00000000 --- a/dynamic_frudis/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id 'com.android.dynamic-feature' -} - -android { - compileSdkVersion 30 - - defaultConfig { - minSdkVersion 21 - - } - compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':app') - - implementation 'androidx.appcompat:appcompat:1.2.0' -} diff --git a/dynamic_frudis/src/main/AndroidManifest.xml b/dynamic_frudis/src/main/AndroidManifest.xml deleted file mode 100644 index a4fad88a..00000000 --- a/dynamic_frudis/src/main/AndroidManifest.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java deleted file mode 100644 index 2a98ae74..00000000 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ /dev/null @@ -1,29 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import android.content.Context; -import android.util.Log; - -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; - -public class DynamicContext { - - public void init(Context context) { - Log.d("DynamicContext", "Caricamento personalizzazioni per Frudis"); - - try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); - } catch (Exception ex) { - UtilityExceptions.defaultException(context, ex); - } - - Log.d("DynamicContext", "Caricamento personalizzazioni per Frudis COMPLETATO"); - - } - -} diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java deleted file mode 100644 index f01ceee4..00000000 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ /dev/null @@ -1,12 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; -import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; - -public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration { - - public CustomConfiguration() { - configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationFRUDIS()); - } - -} diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 77adb537..00000000 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - @Override - public boolean shoudShowCodMdepFilter() { - return false; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return false; - } - - @Override - public boolean shoudShowAgenteFilter() { - return false; - } -} diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java deleted file mode 100644 index a9c9749d..00000000 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java +++ /dev/null @@ -1,105 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; -import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; -import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment; -import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment; -import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment; -import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment; -import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment; -import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; -import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment; -import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment; - -public class MenuConfigurationFRUDIS extends BaseMenuConfiguration { - - public MenuConfigurationFRUDIS() { - - - this - .addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.checkout) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_spedizione) - .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_free_picking) - .setTitleText(it.integry.integrywmsnative.R.string.free_picking) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente) - .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery_customer) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery) - .setFragmentFactory(UltimeConsegneClienteFragment::newInstance)) - - ) - .addGroup(new MenuGroup() - - .setGroupText(it.integry.integrywmsnative.R.string.manufacture) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_produzione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_lavorazione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale) - .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(ProdVersamentoMaterialeFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale) - .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance)) - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.internal_handling) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce) - .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) - .setFragmentFactory(VersamentoMerceFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze) - .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box) - .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) - - - ); - - - - } - -} diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java deleted file mode 100644 index 2f0ed82a..00000000 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,23 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; -import it.integry.integrywmsnative.core.settings.SettingsManager; - -public class OrdiniVendita implements IOrdiniVendita { - - - @Override - public void distribuisciCollo(MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { -// UtilityToast.showToast("Avviato metodo in Frudis"); - - ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), - onComplete, - onFailed); - } -} diff --git a/dynamic_gramm/.gitignore b/dynamic_gramm/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/dynamic_gramm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/dynamic_gramm/build.gradle b/dynamic_gramm/build.gradle deleted file mode 100644 index 18391429..00000000 --- a/dynamic_gramm/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id 'com.android.dynamic-feature' -} - -android { - compileSdkVersion 30 - - defaultConfig { - minSdkVersion 21 - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - - lintOptions { - abortOnError false - } - -} - -dependencies { - - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':app') -} \ No newline at end of file diff --git a/dynamic_gramm/src/androidTest/java/it/integry/wms/dynamic_customization/ExampleInstrumentedTest.java b/dynamic_gramm/src/androidTest/java/it/integry/wms/dynamic_customization/ExampleInstrumentedTest.java deleted file mode 100644 index 317862c8..00000000 --- a/dynamic_gramm/src/androidTest/java/it/integry/wms/dynamic_customization/ExampleInstrumentedTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - } -} \ No newline at end of file diff --git a/dynamic_gramm/src/main/AndroidManifest.xml b/dynamic_gramm/src/main/AndroidManifest.xml deleted file mode 100644 index 01ea2c08..00000000 --- a/dynamic_gramm/src/main/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java deleted file mode 100644 index f78de76e..00000000 --- a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ /dev/null @@ -1,29 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import android.content.Context; -import android.util.Log; - -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; - -public class DynamicContext { - - public void init(Context context) { - Log.d("DynamicContext", "Caricamento personalizzazioni per Azienda GRAMM"); - - try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); - } catch (Exception ex) { - UtilityExceptions.defaultException(context, ex); - } - - Log.d("DynamicContext", "Caricamento personalizzazioni per Azienda GRAMM COMPLETATO"); - - } - -} diff --git a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java deleted file mode 100644 index 5f92ec84..00000000 --- a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ /dev/null @@ -1,12 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; -import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; - -public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration { - - public CustomConfiguration() { - configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationGRAMM()); - } - -} diff --git a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 77adb537..00000000 --- a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - @Override - public boolean shoudShowCodMdepFilter() { - return false; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return false; - } - - @Override - public boolean shoudShowAgenteFilter() { - return false; - } -} diff --git a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java b/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java deleted file mode 100644 index 672371ec..00000000 --- a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java +++ /dev/null @@ -1,124 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; -import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; -import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment; -import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment; -import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment; -import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment; -import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment; -import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; -import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment; -import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment; -import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment; - -public class MenuConfigurationGRAMM extends BaseMenuConfiguration { - - public MenuConfigurationGRAMM() { - - - - this - .addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.purchase) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_acquisto) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_accettazione) - .setTitleText(it.integry.integrywmsnative.R.string.accettazione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_download) - .setFragmentFactory(MainAccettazioneFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_resi_fornitore) - .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_arrivi_fornitore_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery) - .setFragmentFactory(UltimiArriviFornitoreFragment::newInstance)) - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.checkout) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_spedizione) - .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_free_picking) - .setTitleText(it.integry.integrywmsnative.R.string.free_picking) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente) - .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery_customer) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery) - .setFragmentFactory(UltimeConsegneClienteFragment::newInstance)) - - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.manufacture) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_produzione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_lavorazione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_free_lav_picking) - .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_libero) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_posizionamento_da_ord) - .setTitleText(it.integry.integrywmsnative.R.string.prod_fabbisogno_linee_prod_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_merce) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) - .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance)) - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.internal_handling) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce) - .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) - .setFragmentFactory(VersamentoMerceFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze) - .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box) - .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) - - - ); - - - - } - -} diff --git a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java deleted file mode 100644 index e5c916e6..00000000 --- a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,23 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; -import it.integry.integrywmsnative.core.settings.SettingsManager; - -public class OrdiniVendita implements IOrdiniVendita { - - - @Override - public void distribuisciCollo(MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { -// UtilityToast.showToast("Avviato metodo in BaseFeature"); - - ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), - onComplete, - onFailed); - } -} diff --git a/dynamic_gramm/src/test/java/it/integry/wms/dynamic_customization/ExampleUnitTest.java b/dynamic_gramm/src/test/java/it/integry/wms/dynamic_customization/ExampleUnitTest.java deleted file mode 100644 index 1e97227b..00000000 --- a/dynamic_gramm/src/test/java/it/integry/wms/dynamic_customization/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/dynamic_ime/.gitignore b/dynamic_ime/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/dynamic_ime/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/dynamic_ime/build.gradle b/dynamic_ime/build.gradle deleted file mode 100644 index e0edeefa..00000000 --- a/dynamic_ime/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id 'com.android.dynamic-feature' -} - -android { - compileSdkVersion 30 - - - - defaultConfig { - minSdkVersion 21 - - - } - compileOptions { - sourceCompatibility = '1.8' - targetCompatibility = '1.8' - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':app') - - implementation 'androidx.appcompat:appcompat:1.2.0' -} diff --git a/dynamic_ime/src/main/AndroidManifest.xml b/dynamic_ime/src/main/AndroidManifest.xml deleted file mode 100644 index 429d9080..00000000 --- a/dynamic_ime/src/main/AndroidManifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java deleted file mode 100644 index de37a9a3..00000000 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ /dev/null @@ -1,29 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import android.content.Context; -import android.util.Log; - -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; - -public class DynamicContext { - - public void init(Context context) { - Log.d("DynamicContext", "Caricamento personalizzazioni per Azienda IME"); - - try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); - } catch (Exception ex) { - UtilityExceptions.defaultException(context, ex); - } - - Log.d("DynamicContext", "Caricamento personalizzazioni per Azienda IME COMPLETATO"); - - } - -} diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java deleted file mode 100644 index 8f1687ab..00000000 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ /dev/null @@ -1,12 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; -import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; - -public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration { - - public CustomConfiguration() { - configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationIME()); - } - -} diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 77adb537..00000000 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - @Override - public boolean shoudShowCodMdepFilter() { - return false; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return false; - } - - @Override - public boolean shoudShowAgenteFilter() { - return false; - } -} diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java deleted file mode 100644 index 5dd95f1d..00000000 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java +++ /dev/null @@ -1,109 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; -import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; -import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment; -import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment; -import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment; -import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment; -import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; -import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment; -import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment; -import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment; - -public class MenuConfigurationIME extends BaseMenuConfiguration { - - public MenuConfigurationIME() { - - - - this - .addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.purchase) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_acquisto) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_accettazione) - .setTitleText(it.integry.integrywmsnative.R.string.accettazione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_download) - .setFragmentFactory(MainAccettazioneFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_resi_fornitore) - .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_arrivi_fornitore_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery) - .setFragmentFactory(UltimiArriviFornitoreFragment::newInstance)) - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.checkout) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_spedizione) - .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_free_picking) - .setTitleText(it.integry.integrywmsnative.R.string.free_picking) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente) - .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery_customer) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery) - .setFragmentFactory(UltimeConsegneClienteFragment::newInstance)) - - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.manufacture) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_produzione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_lavorazione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null))) - ).addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.internal_handling) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce) - .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) - .setFragmentFactory(VersamentoMerceFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze) - .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box) - .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) - - - ); - - - - } - -} diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java deleted file mode 100644 index e5c916e6..00000000 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,23 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; -import it.integry.integrywmsnative.core.settings.SettingsManager; - -public class OrdiniVendita implements IOrdiniVendita { - - - @Override - public void distribuisciCollo(MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { -// UtilityToast.showToast("Avviato metodo in BaseFeature"); - - ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), - onComplete, - onFailed); - } -} diff --git a/dynamic_saporiveri/.gitignore b/dynamic_saporiveri/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/dynamic_saporiveri/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/dynamic_saporiveri/build.gradle b/dynamic_saporiveri/build.gradle deleted file mode 100644 index 1973cdf9..00000000 --- a/dynamic_saporiveri/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id 'com.android.dynamic-feature' -} - -android { - compileSdkVersion 30 - - - - defaultConfig { - minSdkVersion 21 - - } - compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':app') - - implementation 'androidx.appcompat:appcompat:1.2.0' -} diff --git a/dynamic_saporiveri/src/main/AndroidManifest.xml b/dynamic_saporiveri/src/main/AndroidManifest.xml deleted file mode 100644 index 7990c852..00000000 --- a/dynamic_saporiveri/src/main/AndroidManifest.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java deleted file mode 100644 index e373a3d5..00000000 --- a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ /dev/null @@ -1,31 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import android.content.Context; -import android.util.Log; - -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.wms.dynamic_customization.extensions.BarcodeCustomization; -import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; - -public class DynamicContext { - - public void init(Context context) { - Log.d("DynamicContext", "Caricamento personalizzazioni per SaporiVeri"); - - try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); - ClassRouter.registerPath(ClassRouter.PATH.BARCODE_CUSTOMIZATION, BarcodeCustomization.class); - } catch (Exception ex) { - UtilityExceptions.defaultException(context, ex); - } - - Log.d("DynamicContext", "Caricamento personalizzazioni per SaporiVeri COMPLETATO"); - - } - -} diff --git a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/BarcodeCustomization.java b/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/BarcodeCustomization.java deleted file mode 100644 index 48f469d8..00000000 --- a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/BarcodeCustomization.java +++ /dev/null @@ -1,14 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IBarcodeCustomization; - -public class BarcodeCustomization implements IBarcodeCustomization { - - @Override - public boolean shouldForceToEan13(String barcode) { - - return barcode != null && barcode.length() == 13; - - } - -} diff --git a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java deleted file mode 100644 index 5c3ab3cd..00000000 --- a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ /dev/null @@ -1,11 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; -import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; - -public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration { - - public CustomConfiguration() { - } - -} diff --git a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 77adb537..00000000 --- a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - @Override - public boolean shoudShowCodMdepFilter() { - return false; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return false; - } - - @Override - public boolean shoudShowAgenteFilter() { - return false; - } -} diff --git a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java deleted file mode 100644 index e5c916e6..00000000 --- a/dynamic_saporiveri/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,23 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; -import it.integry.integrywmsnative.core.settings.SettingsManager; - -public class OrdiniVendita implements IOrdiniVendita { - - - @Override - public void distribuisciCollo(MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { -// UtilityToast.showToast("Avviato metodo in BaseFeature"); - - ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), - onComplete, - onFailed); - } -} diff --git a/dynamic_saporiveri_pv/.gitignore b/dynamic_saporiveri_pv/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/dynamic_saporiveri_pv/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/dynamic_saporiveri_pv/build.gradle b/dynamic_saporiveri_pv/build.gradle deleted file mode 100644 index 1973cdf9..00000000 --- a/dynamic_saporiveri_pv/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id 'com.android.dynamic-feature' -} - -android { - compileSdkVersion 30 - - - - defaultConfig { - minSdkVersion 21 - - } - compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':app') - - implementation 'androidx.appcompat:appcompat:1.2.0' -} diff --git a/dynamic_saporiveri_pv/src/main/AndroidManifest.xml b/dynamic_saporiveri_pv/src/main/AndroidManifest.xml deleted file mode 100644 index ae16afaa..00000000 --- a/dynamic_saporiveri_pv/src/main/AndroidManifest.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java deleted file mode 100644 index ef4bfdf9..00000000 --- a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ /dev/null @@ -1,29 +0,0 @@ -package it.integry.wms.dynamic_customization; - -import android.content.Context; -import android.util.Log; - -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; - -public class DynamicContext { - - public void init(Context context) { - Log.d("DynamicContext", "Caricamento personalizzazioni per SaporiVeri(PV)"); - - try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); - } catch (Exception ex) { - UtilityExceptions.defaultException(context, ex); - } - - Log.d("DynamicContext", "Caricamento personalizzazioni per SasporiVeri(PV) COMPLETATO"); - - } - -} diff --git a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java deleted file mode 100644 index 46389f8a..00000000 --- a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ /dev/null @@ -1,13 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; -import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; - -public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration { - - public CustomConfiguration() { - configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationSAPORIVERIPV()); - configurations.put(Keys.CUSTOM_DYNAMIC_VERSION_PATH,"_pv"); - } - -} diff --git a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 77adb537..00000000 --- a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - @Override - public boolean shoudShowCodMdepFilter() { - return false; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return false; - } - - @Override - public boolean shoudShowAgenteFilter() { - return false; - } -} diff --git a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationSAPORIVERIPV.java b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationSAPORIVERIPV.java deleted file mode 100644 index 78c90dcb..00000000 --- a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationSAPORIVERIPV.java +++ /dev/null @@ -1,49 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; -import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; -import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment; -import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaFragment; - -public class MenuConfigurationSAPORIVERIPV extends BaseMenuConfiguration { - - public MenuConfigurationSAPORIVERIPV() { - - this - .addGroup( - new MenuGroup() - .setCodMenu("MM012") - .setGroupText(it.integry.integrywmsnative.R.string.punto_vendita) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_puntivendita) - - .addItem(new MenuItem() - .setCodMenu("MG057") - .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto) - .setTitleText(it.integry.integrywmsnative.R.string.generate_orders) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv) - .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance)) -// .addItem(new MenuItem() -// .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto_trasmessi) -// .setTitleText(it.integry.integrywmsnative.R.string.transmitted_orders) -// .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list) -// .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list) -// .setFragmentClass(PVOrdiniAcquistoTransmittedListFragment.newInstance())) - ) - .addGroup( - new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.checkout) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_free_picking) - .setTitleText(it.integry.integrywmsnative.R.string.free_picking) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) - ); - - - } - -} diff --git a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java deleted file mode 100644 index 43e0e202..00000000 --- a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,24 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; -import it.integry.integrywmsnative.core.settings.SettingsManager; - -public class OrdiniVendita implements IOrdiniVendita { - - - @Override - public void distribuisciCollo(MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { - //UtilityToast.showToast("Avviato metodo in SaporiVeriPv"); - - ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), - onComplete, - onFailed); - } - -} diff --git a/settings.gradle b/settings.gradle index 10f357dd..d7777a0c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':app', ':dynamic_gramm', ':pointmobilescannerlibrary', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime', ':dynamic_frudis', ':dynamic_saporiveri_pv', ':keyobardemulatorscannerlibrary', ':barcode_base_android_library', ':dynamic_saporiveri' -include ':dynamic_agricoper' +include ':app', ':pointmobilescannerlibrary', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':keyobardemulatorscannerlibrary', ':barcode_base_android_library' +