diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java index 34a0fe6a..9fb9c79e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java @@ -33,6 +33,16 @@ public class SitArtOrdDTO { private String descrizioneCommessa; private String termCons; private String descrizioneEstesaArt; + private String descrizioneEstesaOrd; + + public String getDescrizioneEstesaOrd() { + return descrizioneEstesaOrd; + } + + public SitArtOrdDTO setDescrizioneEstesaOrd(String descrizioneEstesaOrd) { + this.descrizioneEstesaOrd = descrizioneEstesaOrd; + return this; + } public String getCodJcom() { return codJcom; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java index 2e20aca7..d3754845 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java @@ -585,8 +585,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col)); } + accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneEstesaOrd()); + if (x.getMtbAart() != null) { - accettazioneOrdiniPickingListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa()); accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione()); } @@ -788,7 +789,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A } @Override - public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, RunnableArgss onComplete) { + public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, String customArtDescription, RunnableArgss onComplete) { DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO() .setMtbAart(mtbAart) .setInitialNumCnf(initialNumCnf) @@ -807,7 +808,8 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A .setDataScad(dataScad) .setCanPartitaMagBeChanged(canPartitaMagBeChanged) .setCanLUBeClosed(true) - .setCanOverflowOrderQuantity(canOverflowQuantity); + .setCanOverflowOrderQuantity(canOverflowQuantity) + .setCustomArtDescription(customArtDescription); if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java index 700974e2..85095aec 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java @@ -539,6 +539,7 @@ public class AccettazioneOrdiniPickingViewModel { partitaMag, dataScad, true, + pickingObjectDTO.getSitArtOrdDTO().getDescrizioneEstesaOrd(), (pickedQuantityDTO, shouldCloseLU) -> { this.saveNewRow(pickingObjectDTO, pickedQuantityDTO.getNumCnf(), @@ -625,6 +626,7 @@ public class AccettazioneOrdiniPickingViewModel { mtbColrToEdit.getPartitaMag(), mtbColrToEdit.getDataScadPartita(), true, + null, (pickedQuantityDTO, shouldCloseLU) -> { this.saveEditedRow(mtbColrToEdit, @@ -883,6 +885,7 @@ public class AccettazioneOrdiniPickingViewModel { String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, + String customArtDescription, RunnableArgss onComplete) { if (this.mListener != null) mListener.onItemDispatched(pickingObjectDTO, mtbAart, @@ -902,6 +905,7 @@ public class AccettazioneOrdiniPickingViewModel { dataScad, canPartitaMagBeChanged, true, + customArtDescription, onComplete); } @@ -958,6 +962,7 @@ public class AccettazioneOrdiniPickingViewModel { LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, + String customArtDescription, RunnableArgss onComplete); void onFilterCodMartApplied(String codMartToFilter); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java index 1c515e8c..3dcd8d96 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java @@ -54,6 +54,8 @@ public class DialogInputQuantityV2DTO { private boolean canOverflowOrderQuantity; + private String customArtDescription; + public MtbAart getMtbAart() { return mtbAart; } @@ -359,4 +361,13 @@ public class DialogInputQuantityV2DTO { this.disableTracciabilitaCheck = disableTracciabilitaCheck; return this; } + + public String getCustomArtDescription() { + return customArtDescription; + } + + public DialogInputQuantityV2DTO setCustomArtDescription(String customArtDescription) { + this.customArtDescription = customArtDescription; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index ba5dc825..3d464179 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -48,6 +48,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityFocus; import it.integry.integrywmsnative.core.utility.UtilityObservable; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogInputQuantityV2Binding; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; @@ -151,6 +152,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia this.mViewModel .setMtbAart(mDialogInputQuantityV2DTO.getMtbAart()) + .setArtDescription(UtilityString.isNull(mDialogInputQuantityV2DTO.getCustomArtDescription(), mDialogInputQuantityV2DTO.getMtbAart().getDescrizioneEstesa())) .setInitialNumCnf(mDialogInputQuantityV2DTO.getInitialNumCnf()) .setInitialQtaCnf(mDialogInputQuantityV2DTO.getInitialQtaCnf()) .setInitialQtaTot(mDialogInputQuantityV2DTO.getInitialQtaTot()) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index cd3a5154..ad380519 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -8,6 +8,7 @@ import java.time.LocalDate; import javax.inject.Inject; import it.integry.barcode_base_android_library.model.BarcodeScanDTO; +import it.integry.integrywmsnative.core.di.BindableString; import it.integry.integrywmsnative.core.expansion.RunnableArgsWithReturn; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; @@ -32,6 +33,7 @@ public class DialogInputQuantityV2ViewModel { private final int UPDATE_QTA_TOT = 2; public ObservableField mtbAart = new ObservableField<>(); + public BindableString artDescription = new BindableString(); public ObservableField blockedNumCnf = new ObservableField<>(); public ObservableField blockedQtaCnf = new ObservableField<>(); @@ -236,6 +238,11 @@ public class DialogInputQuantityV2ViewModel { return this; } + public DialogInputQuantityV2ViewModel setArtDescription(String artDescription) { + this.artDescription.set(artDescription); + return this; + } + public DialogInputQuantityV2ViewModel setInitialNumCnf(BigDecimal initialNumCnf) { this.initialNumCnf = initialNumCnf; return this; diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml index 6b67d8f5..48d41497 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:singleLine="false" - android:text="@{viewmodel.mtbAart.descrizioneEstesa}" + android:text="@{viewmodel.artDescription}" tools:text="RAD 25 D H/L 200 - 10 EL B BIANCO" />