From 143a6c9e9ce1932ab60066f28d3a33976dc7d4bb Mon Sep 17 00:00:00 2001 From: MarcoE Date: Wed, 6 Dec 2023 15:05:13 +0100 Subject: [PATCH] Aggiunti codici e descrizioni di gruppo e sotto gruppo merceologico in approvvigionamento linee --- .../core/settings/DBSettingsModel.java | 10 +++++ .../core/settings/SettingsManager.java | 6 +++ .../OrdiniUscitaElencoFragment.java | 5 ++- .../ProdFabbisognoLineeProdFragment.java | 11 ++++- .../dto/ProdFabbisognoLineeProdDTO.java | 40 +++++++++++++++++++ .../gest/spedizione/SpedizioneActivity.java | 8 +++- 6 files changed, 75 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 99eb2694..c071ed44 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -55,6 +55,7 @@ public class DBSettingsModel { private boolean notifyLotStatus = false; private boolean groupShippingByCommodityGroup = true; + private boolean groupPoductionByCommodityGroup; private boolean showCodFornSpedizione = true; private boolean flagCanCreateInventario = true; private boolean flagCanAddUnknownItemsInventario = true; @@ -566,4 +567,13 @@ public class DBSettingsModel { this.flagOverflowQuantityWarning = flagOverflowQuantityWarning; return this; } + + public boolean isGroupPoductionByCommodityGroup() { + return groupPoductionByCommodityGroup; + } + + public DBSettingsModel setGroupPoductionByCommodityGroup(boolean groupPoductionByCommodityGroup) { + this.groupPoductionByCommodityGroup = groupPoductionByCommodityGroup; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index e9902c40..0974ebb6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -272,6 +272,12 @@ public class SettingsManager { .setSection("PRODUZIONE") .setKeySection("FILTER_FORNTIORE_PROD") .setSetter(dbSettingsModelIstance::setFilterFornitoreProd)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("PRODUZIONE") + .setKeySection("FLAG_GROUP_BY_GRP_MERC") + .setSetter(dbSettingsModelIstance::setGroupPoductionByCommodityGroup) + .setDefaultValue(false)); stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) .setGestName("PICKING") .setSection("SPEDIZIONE") diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 2ffb1c47..e3fe910c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -825,6 +825,8 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF int alreadyRegisteredUL = alreadyRegisteredMtbColts.size(); + boolean divideByGrpMerc = SettingsManager.iDB().isGroupShippingByCommodityGroup(); + DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(), Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, orders.size()), orders.size()) + "
" + @@ -839,7 +841,8 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF mCurrentGestioneCol, mCurrentSegnoCol, MtbColr.Causale.DEFAULT, - mDialogRowInfo) + mDialogRowInfo, + divideByGrpMerc) ).show(getActivity().getSupportFragmentManager(), "tag"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java index d4eb9a27..31fe9ee3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java @@ -125,7 +125,11 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi .setQtaOrd(x.getQtaFabbisogno()) .setNumCnfOrd(x.getNumCnfFabbisogno()) .setQtaCnfOrd(UtilityBigDecimal.divide(x.getQtaFabbisogno(), x.getNumCnfFabbisogno())) - .setFlagEnablePickManuale(false); + .setFlagEnablePickManuale(false) + .setCodMgrp(x.getCodMgrp()) + .setDescrizioneMgrp(x.getDescrizioneMgrp()) + .setCodMsgr(x.getCodMsgr()) + .setDescrizioneMsgr(x.getDescrizioneMsgr()); sitArtOrdDTO.getExtraInfo().put("dataInizio", x.getDataInizio()); sitArtOrdDTO.getExtraInfo().put("dataFine", x.getDataFine()); @@ -134,6 +138,8 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi }) .toList(); + boolean divideByGrpMerc = SettingsManager.iDB().isGroupPoductionByCommodityGroup(); + SpedizioneActivity.startActivity(getActivity(), sitArtOrdDTOS, null, @@ -141,7 +147,8 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi GestioneEnum.LAVORAZIONE, +1, MtbColr.Causale.VERSAMENTO, - DialogRowInfoProdFabbisognoLineeProdView.class); + DialogRowInfoProdFabbisognoLineeProdView.class, + divideByGrpMerc); popMe(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java index 4839dc88..e36bc238 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeProdDTO.java @@ -16,6 +16,10 @@ public class ProdFabbisognoLineeProdDTO { private BigDecimal numCnfFabbisogno; private Date dataInizio; private Date dataFine; + private String codMgrp; + private String descrizioneMgrp; + private String codMsgr; + private String descrizioneMsgr; public ProdFabbisognoLineeProdDTO() { } @@ -118,4 +122,40 @@ public class ProdFabbisognoLineeProdDTO { this.dataFine = dataFine; return this; } + + public String getCodMgrp() { + return codMgrp; + } + + public ProdFabbisognoLineeProdDTO setCodMgrp(String codMgrp) { + this.codMgrp = codMgrp; + return this; + } + + public String getDescrizioneMgrp() { + return descrizioneMgrp; + } + + public ProdFabbisognoLineeProdDTO setDescrizioneMgrp(String descrizioneMgrp) { + this.descrizioneMgrp = descrizioneMgrp; + return this; + } + + public String getCodMsgr() { + return codMsgr; + } + + public ProdFabbisognoLineeProdDTO setCodMsgr(String codMsgr) { + this.codMsgr = codMsgr; + return this; + } + + public String getDescrizioneMsgr() { + return descrizioneMsgr; + } + + public ProdFabbisognoLineeProdDTO setDescrizioneMsgr(String descrizioneMsgr) { + this.descrizioneMsgr = descrizioneMsgr; + return this; + } } 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 2a7ea1bf..fb08e0b2 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 @@ -126,7 +126,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, - Class infoDialogClassType) { + Class infoDialogClassType, + boolean divideByGrpMerc) { Intent myIntent = new Intent(context, SpedizioneActivity.class); String keyPickingList = DataCache.addItem(ordini); @@ -150,6 +151,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo String keyInfoDialogClassType = DataCache.addItem(infoDialogClassType); myIntent.putExtra("keyInfoDialogClassType", keyInfoDialogClassType); + String keyDivideByGrpMerc = DataCache.addItem(divideByGrpMerc); + myIntent.putExtra("keyDivideByGrpMerc", keyDivideByGrpMerc); + context.startActivity(myIntent); } @@ -164,6 +168,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo mSegnoCol = DataCache.retrieveItem(getIntent().getStringExtra("keySegnoCol")); mDefaultCausaleUL = DataCache.retrieveItem(getIntent().getStringExtra("keyDefaultCausaleCol")); mInfoDialogClassType = DataCache.retrieveItem(getIntent().getStringExtra("keyInfoDialogClassType")); + mDivideByGrpMerc = DataCache.retrieveItem(getIntent().getStringExtra("keyDivideByGrpMerc")); mBindings = DataBindingUtil.setContentView(this, R.layout.activity_spedizione); @@ -178,7 +183,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo getSupportActionBar().setDisplayHomeAsUpEnabled(true); mFlagShowCodForn = SettingsManager.iDB().isShowCodFornSpedizione(); - mDivideByGrpMerc = SettingsManager.iDB().isGroupShippingByCommodityGroup(); SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); mEnableQuantityReset = sharedPreferences.getBoolean("picking_uscita_enable_quantity_reset", true);