diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java index a7e37df3..78148940 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java @@ -88,6 +88,11 @@ public class MtbAart extends EntityBase { private String marchio; private Integer sezione; private UntMisRifPesoEnum untMisRifPeso; + + private BigDecimal qtaEsistente; + private BigDecimal qtaImpegnata; + private BigDecimal numCnfEsistente; + private BigDecimal numCnfImpegnata; private List mtbUntMis; @@ -819,4 +824,40 @@ public class MtbAart extends EntityBase { this.untMisRifPeso = untMisRifPeso; return this; } + + public BigDecimal getQtaEsistente() { + return qtaEsistente; + } + + public MtbAart setQtaEsistente(BigDecimal qtaEsistente) { + this.qtaEsistente = qtaEsistente; + return this; + } + + public BigDecimal getQtaImpegnata() { + return qtaImpegnata; + } + + public MtbAart setQtaImpegnata(BigDecimal qtaImpegnata) { + this.qtaImpegnata = qtaImpegnata; + return this; + } + + public BigDecimal getNumCnfEsistente() { + return numCnfEsistente; + } + + public MtbAart setNumCnfEsistente(BigDecimal numCnfEsistente) { + this.numCnfEsistente = numCnfEsistente; + return this; + } + + public BigDecimal getNumCnfImpegnata() { + return numCnfImpegnata; + } + + public MtbAart setNumCnfImpegnata(BigDecimal numCnfImpegnata) { + this.numCnfImpegnata = numCnfImpegnata; + return this; + } } 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 ff9e8e25..886bcff7 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 @@ -326,7 +326,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { public void getBySSCC(String ssccString, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs onComplete, RunnableArgs onFailed) { ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class); - colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new Callback>() { + colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new Callback<>() { @Override public void onResponse(Call> call, Response> response) { analyzeAnswer(response, "GetBySSCC", mtbColt -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java index 2ba06186..effe259b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java @@ -49,6 +49,7 @@ import it.integry.integrywmsnative.core.utility.UtilityContext; import it.integry.integrywmsnative.databinding.ActivityMainBinding; import it.integry.integrywmsnative.gest.login.LoginActivity; import it.integry.integrywmsnative.gest.settings.MainSettingsFragment; +import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity { @@ -70,6 +71,10 @@ public class MainActivity extends BaseActivity @Inject UpdatesManager updatesManager; + + @Inject + DialogInputQuantityV2View mDialogInputQuantityV2View; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -103,6 +108,14 @@ public class MainActivity extends BaseActivity init(); + +// mDialogInputQuantityV2View +// .setDialogInputQuantityV2DTO(new DialogInputQuantityV2DTO() +// .setMtbAart(new MtbAart() +// .setCodMart("AAAA") +// .setFlagQtaCnfFissa("S"))) +// .show(getSupportFragmentManager(), "tag"); + } private void startLoginActivity() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java index 99bff8eb..53076e0e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java @@ -231,6 +231,7 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett public void requestResources() { this.onLoadingEnded(); BarcodeManager.disable(); + this.runOnUiThread(() -> { DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il numero di risorse da allocare", this.hrNum.get(), "n. risorse", qta -> { @@ -276,7 +277,7 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett getSupportFragmentManager() .beginTransaction() .add(R.id.frame_layout_container, - ProdRecuperoMaterialeFragment.newInstance(null, DATA_KEY_FRAGMENT_LISTENER)) + ProdRecuperoMaterialeFragment.newInstance(mViewModel.getLineaProd().getCodJfas(), DATA_KEY_FRAGMENT_LISTENER)) .addToBackStack("ProdRecuperoMaterialeFragment") .commit(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java index 7c07a7ce..28bf4b07 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java @@ -10,7 +10,6 @@ import android.view.ViewGroup; import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.ObservableArrayList; -import androidx.recyclerview.widget.LinearLayoutManager; import java.util.List; @@ -43,11 +42,6 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled private FragmentLineeProdBinding mBinding; private ElevatedToolbar mToolbar; private int barcodeScannerIstanceID = -1; - private final RunnableArgs onScanSuccessful = data -> { - this.onLoadingStarted(); - - this.mViewModel.processBarcodeDTO(data); - }; public static ProdLineeProduzioneFragment newInstance() { return new ProdLineeProduzioneFragment(); @@ -83,6 +77,11 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled .setOnScanFailed(this::onError)); } + private final RunnableArgs onScanSuccessful = data -> { + this.onLoadingStarted(); + this.mViewModel.processBarcodeDTO(data); + }; + @Override public void setScrollToolbar(ElevatedToolbar toolbar) { mToolbar = toolbar; @@ -98,11 +97,14 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled private void initRecyclerView() { this.mViewModel.getProdLinesList().observe(getViewLifecycleOwner(), this::refreshLineeProd); - LinesListAdapter prodLinesListAdapter = new LinesListAdapter(this.requireActivity(), this.mLinesObservableList); - prodLinesListAdapter.setEmptyView(this.mBinding.linesListEmptyView); + + LinesListAdapter prodLinesListAdapter = new LinesListAdapter(this.mLinesObservableList); this.mBinding.linesMainList.setAdapter(prodLinesListAdapter); - this.mBinding.linesMainList.setLayoutManager(new LinearLayoutManager(this.requireActivity())); - prodLinesListAdapter.setOnItemClicked(this.mViewModel::onLineSelected); + + prodLinesListAdapter + .setOnItemClicked(this::selectLine) + .setEmptyView(this.mBinding.linesListEmptyView); + if (mToolbar != null) mToolbar.setRecyclerView(this.mBinding.linesMainList); } @@ -136,6 +138,7 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled public void selectLine(ProdLineStatusDTO dto) { this.onLoadingEnded(); BarcodeManager.disable(); + if (!dto.isStarted()) { this.requestResources(dto); } else { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ui/LinesListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ui/LinesListAdapter.java index c7f01ae0..a684964b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ui/LinesListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ui/LinesListAdapter.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.gest.prod_linee_produzione.ui; -import android.content.Context; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -16,13 +15,11 @@ import it.integry.integrywmsnative.databinding.FragmentLineeProdMainListModelBin import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO; public class LinesListAdapter extends ExtendedRecyclerView { - private Context mContext; private RunnableArgs mOnItemClicked; - public LinesListAdapter(Context context, ObservableArrayList myDataset) { + public LinesListAdapter(ObservableArrayList myDataset) { super(myDataset); - this.mContext = context; } @NonNull @@ -38,6 +35,7 @@ public class LinesListAdapter extends ExtendedRecyclerView { if (this.mOnItemClicked != null) this.mOnItemClicked.run(line); @@ -45,8 +43,9 @@ public class LinesListAdapter extends ExtendedRecyclerView onItemClicked) { + public LinesListAdapter setOnItemClicked(RunnableArgs onItemClicked) { this.mOnItemClicked = onItemClicked; + return this; } static class SingleItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java index 2914278a..14782e1d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java @@ -63,6 +63,8 @@ public class ProdRientroMerceFragment extends BaseFragment implements return new ProdRientroMerceFragment(); } + + @Override public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java index dceba744..7962a280 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java @@ -52,7 +52,6 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdDTO; import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdView; import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCView; -import it.integry.integrywmsnative.view.dialogs.printSsccUl.dto.PrintUlDTO; /** * A simple {@link Fragment} subclass. @@ -251,18 +250,16 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements @Override public void onDataSaved(MtbColt mtbColt) { - PrintUlDTO dto = new PrintUlDTO(); - dto.setMtbColt(mtbColt); String codJcom = currentOrder.getValue().getCodJcom(); - dto.setFlagPrintShipmentLabel(!UtilityString.isNullOrEmpty(codJcom)); - dto.setFlagPrintProductionLabel(UtilityString.isNullOrEmpty(codJcom)); - DialogPrintUlSSCCView.newInstance(dto, result -> { - if (result.isFlagPrintShipmentLabel() || result.isFlagPrintProductionLabel()) { - this.mViewModel.printSavedMtbColt(result); - } else { - this.mViewModel.refreshMtbColts(); - } - }).show(requireActivity().getSupportFragmentManager(), "DialogPrintUlSSCC"); + + DialogPrintUlSSCCView.newInstance(codJcom, mtbColt, result -> { + if (result.isFlagPrintShipmentLabel() || result.isFlagPrintProductionLabel()) { + this.mViewModel.printSavedMtbColt(result); + } else { + this.mViewModel.refreshMtbColts(); + } + }) + .show(requireActivity().getSupportFragmentManager(), "DialogPrintUlSSCC"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 01a16e85..1aa73508 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -288,8 +288,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr } @Override - public void onArtListLoaded(ArrayList artList) { - DialogChooseArtFromListaArts.make(getActivity(), artList, mtbAart -> mViewModel.dispatchArt(mtbAart, null)).show(); + public void onArtListLoaded(ArrayList artList, RunnableArgs onArtChoosed) { + DialogChooseArtFromListaArts.make(getActivity(), artList, onArtChoosed).show(); } @Override @@ -352,6 +352,10 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, + BigDecimal totalQtaInWarehouse, + BigDecimal totalNumCnfInWarehouse, + BigDecimal totalQtaCommitted, + BigDecimal totalNumCnfCommitted, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, @@ -367,6 +371,10 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr .setInitialNumCnf(initialNumCnf) .setInitialQtaCnf(initialQtaCnf) .setInitialQtaTot(initialQtaTot) + .setTotalQtaInWarehouse(totalQtaInWarehouse) + .setTotalNumCnfInWarehouse(totalNumCnfInWarehouse) + .setTotalQtaCommitted(totalQtaCommitted) + .setTotalNumCnfCommitted(totalNumCnfCommitted) .setTotalQtaToBeTaken(totalQtaToBeTaken) .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken) .setQtaCnfToBeTaken(qtaCnfToBeTaken) @@ -493,7 +501,11 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onPreDestroy(Runnable onComplete) { -// BarcodeManager.removeCallback(barcodeScannerIstanceID); - mViewModel.closeLU(false); + if(mViewModel.getCurrentMtbColt() != null) + mViewModel.closeLU(false); + else { + BarcodeManager.removeCallback(barcodeScannerIstanceID); + onComplete.run(); + } } } 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 1f1eb997..b5d74961 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 @@ -196,10 +196,24 @@ public class RettificaGiacenzeViewModel { return; } + RunnableArgs dispatchArtRunnable = mtbAart -> { + + var matchRows = Stream.of(this.mCurrentMtbColt.getMtbColr()) + .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart())) + .toList(); + + if (matchRows.size() != 1) { + dispatchArt(mtbAart, null); + } else { + dispatchRowEdit(matchRows.get(0)); + } + + }; + if (artsList.size() == 1) { - dispatchArt(artsList.get(0), null); + dispatchArtRunnable.run(artsList.get(0)); } else { - this.sendOnArtListLoaded(new ArrayList<>(artsList)); + this.sendOnArtListLoaded(new ArrayList<>(artsList), dispatchArtRunnable); } } @@ -291,6 +305,10 @@ public class RettificaGiacenzeViewModel { initialNumCnf, initialQtaCnf, initialQtaTot, + mtbAart.getQtaEsistente(), + mtbAart.getNumCnfEsistente(), + mtbAart.getQtaImpegnata(), + mtbAart.getNumCnfImpegnata(), qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, @@ -507,33 +525,41 @@ public class RettificaGiacenzeViewModel { public void dispatchRowEdit(MtbColr mtbColrToUpdate) { - final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO() - .setMtbAart(mtbColrToUpdate.getMtbAart()); + this.mRettificaGiacenzeRESTConsumer.searchArtInt(mtbColrToUpdate.getMtbAart().getCodMart(), newMtbAartList -> { - this.sendOnItemDispatched( - pickingObjectDTO, - pickingObjectDTO.getMtbAart(), - mtbColrToUpdate.getNumCnf(), - mtbColrToUpdate.getQtaCnf(), - mtbColrToUpdate.getQtaCol(), - null, - null, - null, - mtbColrToUpdate.getPartitaMag(), - mtbColrToUpdate.getDataScadPartitaD(), - false, - false, - true, - (pickedQuantityDTO, shouldCloseLU) -> { + var newMtbAart = newMtbAartList.get(0); + + final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO() + .setMtbAart(newMtbAart); + + this.sendOnItemDispatched( + pickingObjectDTO, + pickingObjectDTO.getMtbAart(), + mtbColrToUpdate.getNumCnf(), + mtbColrToUpdate.getQtaCnf(), + mtbColrToUpdate.getQtaCol(), + newMtbAart.getQtaEsistente(), newMtbAart.getNumCnfEsistente(), + newMtbAart.getQtaImpegnata(), newMtbAart.getNumCnfImpegnata(), + null, + null, + null, + mtbColrToUpdate.getPartitaMag(), + mtbColrToUpdate.getDataScadPartitaD(), + false, + false, + true, + (pickedQuantityDTO, shouldCloseLU) -> { + + this.saveEditedRow(mtbColrToUpdate, + pickedQuantityDTO.getNumCnf(), + pickedQuantityDTO.getQtaCnf(), + pickedQuantityDTO.getQtaTot(), + pickedQuantityDTO.getPartitaMag(), + pickedQuantityDTO.getDataScad(), + shouldCloseLU); + }); + }, this::sendError); - this.saveEditedRow(mtbColrToUpdate, - pickedQuantityDTO.getNumCnf(), - pickedQuantityDTO.getQtaCnf(), - pickedQuantityDTO.getQtaTot(), - pickedQuantityDTO.getPartitaMag(), - pickedQuantityDTO.getDataScad(), - shouldCloseLU); - }); } private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) { @@ -670,8 +696,8 @@ public class RettificaGiacenzeViewModel { } - private void sendOnArtListLoaded(ArrayList artList) { - if (this.mListener != null) mListener.onArtListLoaded(artList); + private void sendOnArtListLoaded(ArrayList artList, RunnableArgs onArtChoosed) { + if (this.mListener != null) mListener.onArtListLoaded(artList, onArtChoosed); } private void sendOnLUOpenRequest(RunnableArgss onComplete) { @@ -699,6 +725,10 @@ public class RettificaGiacenzeViewModel { BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, + BigDecimal totalQtaInWarehouse, + BigDecimal totalNumCnfInWarehouse, + BigDecimal totalQtaCommitted, + BigDecimal totalNumCnfCommitted, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, @@ -713,6 +743,10 @@ public class RettificaGiacenzeViewModel { initialNumCnf, initialQtaCnf, initialQtaTot, + totalQtaInWarehouse, + totalNumCnfInWarehouse, + totalQtaCommitted, + totalNumCnfCommitted, totalQtaToBeTaken, totalNumCnfToBeTaken, qtaCnfToBeTaken, @@ -751,7 +785,7 @@ public class RettificaGiacenzeViewModel { void onFornitoriLoaded(ArrayList fornitoriList); - void onArtListLoaded(ArrayList artList); + void onArtListLoaded(ArrayList artList, RunnableArgs onArtChoosed); void onLUOpenRequest(RunnableArgss onComplete); @@ -768,6 +802,10 @@ public class RettificaGiacenzeViewModel { BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, + BigDecimal totalQtaInWarehouse, + BigDecimal totalNumCnfInWarehouse, + BigDecimal totalQtaCommitted, + BigDecimal totalNumCnfCommitted, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java index 2e58d0f1..fe77a742 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java @@ -12,6 +12,7 @@ import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbAartWithFornitore; import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.FornitoreDTO; @@ -41,7 +42,7 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer { " WHERE mtb_lisa.cod_alis = " + UtilityDB.valueToString(codAlis) + " AND mtb_lisa.cod_mart = mtb_aart.cod_mart " + " AND mtb_lisa.cod_mart = mtb_part.cod_mart " + - " AND mtb_part.cod_mdep = '01' " + + " AND mtb_part.cod_mdep = '" + SettingsManager.i().getUserSession().getDepo().getCodMdep() + "' " + " AND (mtb_aart.descrizione_estesa LIKE '%" + codArtForOrDescr + "%' OR cod_art_for LIKE '%" + codArtForOrDescr + "%') " + " ORDER BY ABS(mtb_part.qta_esistente) DESC, mtb_aart.descrizione_estesa"; @@ -55,13 +56,19 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer { public void searchArtInt(String codMartOrBarcodeOrDescr, RunnableArgs> onComplete, RunnableArgs onFailed) { - String sql = "SELECT DISTINCT mtb_aart.* " + - "FROM mtb_aart " + - "LEFT OUTER JOIN mvw_barcode on mtb_aart.cod_mart = mvw_barcode.cod_mart " + - "WHERE CASE" + + String sql = "SELECT DISTINCT mtb_aart.*," + + " qta_esistente, " + + " qta_imp_cli + qta_imp_lav AS qta_impegnata, " + + " num_esistente AS num_cnf_esistente, " + + " num_imp_cli + num_imp_lav AS num_cnf_impegnata " + + " FROM mtb_aart " + + " LEFT OUTER JOIN mvw_barcode on mtb_aart.cod_mart = mvw_barcode.cod_mart " + + " LEFT OUTER JOIN mtb_part mp on mtb_aart.cod_mart = mp.cod_mart " + + " AND mp.cod_mdep = '" + SettingsManager.i().getUserSession().getDepo().getCodMdep() + "'" + + " WHERE CASE" + " WHEN LEN(mvw_barcode.cod_barre) > 13 THEN mvw_barcode.cod_barre " + " ELSE Replicate('0', 13 - len(mvw_barcode.cod_barre))+ mvw_barcode.cod_barre " + - "END LIKE '%' + CASE " + + " END LIKE '%' + CASE " + " WHEN LEN('" + codMartOrBarcodeOrDescr + "') > 13 THEN '" + codMartOrBarcodeOrDescr + "' " + " ELSE Replicate('0', 13 - len('" + codMartOrBarcodeOrDescr + "')) + '" + codMartOrBarcodeOrDescr + "'" + " END " + diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java index 1bf800bb..640444a9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java @@ -1,68 +1,115 @@ package it.integry.integrywmsnative.view.dialogs.base; -import android.app.Dialog; import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.text.InputType; import android.view.LayoutInflater; -import androidx.databinding.DataBindingUtil; +import androidx.annotation.NonNull; +import androidx.databinding.ObservableField; + +import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.utility.UtilityDialog; import it.integry.integrywmsnative.core.utility.UtilityString; -import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding; +import it.integry.integrywmsnative.databinding.DialogInputGeneralContentBinding; /** * Created by GiuseppeS on 22/03/2018. */ -public class DialogSimpleInputHelper { +public class DialogSimpleInputHelper extends MaterialAlertDialogBuilder { - private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { - Dialog dialog = new Dialog(mContext); - DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog); + public final ObservableField inputValue = new ObservableField<>(); + public DialogSimpleInputHelper(@NonNull Context context, String titleText, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { + super(context); - DialogInputGeneralBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_input_general, null, false); - viewModel - .setOnPositive(() -> { + var dialogBindings = DialogInputGeneralContentBinding.inflate(LayoutInflater.from(context)); + dialogBindings.setView(this); - onPositiveClick.run(mBinding.generalInput.getText().toString()); - }) - .setOnNegative(onNegativeClick); + dialogBindings.executePendingBindings(); - mBinding.setViewmodel(viewModel); - - //Title VIEW - - mBinding.titleText.setText(titleText); + this.setTitle(titleText); +// this.setMessage("Inserisci la nuova quantità residua dell'ordine"); + this.setView(dialogBindings.getRoot()); + this.setCancelable(true); if (!UtilityString.isNullOrEmpty(hintText)) { - mBinding.generalInput.setHint(hintText); + dialogBindings.generalInputText.setHint(hintText); } if (!UtilityString.isNullOrEmpty(defaultTextValue)) { - mBinding.generalInput.setText(defaultTextValue); + dialogBindings.generalInputText.setText(defaultTextValue); } if (inputType != null) { - mBinding.generalInput.setInputType(InputType.TYPE_CLASS_NUMBER); + dialogBindings.generalInputText.setInputType(InputType.TYPE_CLASS_NUMBER); } - //Content View - dialog.setCancelable(true); - dialog.setCanceledOnTouchOutside(false); - dialog.setContentView(mBinding.getRoot()); - dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - UtilityDialog.setTo90PercentWidth(mContext, dialog); - return dialog; + this.setPositiveButton("Ok", (dialog, which) -> { + if(onPositiveClick != null) onPositiveClick.run(this.inputValue.get()); + }); + + this.setNegativeButton("Annulla", (dialog, which) -> { + if(onNegativeClick != null) onNegativeClick.run(); + }); + + } - public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs onPositiveClick, Runnable onNegativeClick) { + private static DialogSimpleInputHelper makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { + DialogSimpleInputHelper dialogSimpleInputHelper = new DialogSimpleInputHelper( + mContext, + titleText, + defaultTextValue, + hintText, + onPositiveClick, + onNegativeClick, + inputType + ); + + return dialogSimpleInputHelper; + + // Dialog dialog = new Dialog(mContext); +// DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog); +// +// +// DialogInputGeneralBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_input_general, null, false); +// viewModel +// .setOnPositive(() -> { +// +// onPositiveClick.run(mBinding.generalInput.getText().toString()); +// }) +// .setOnNegative(onNegativeClick); +// +// mBinding.setViewmodel(viewModel); +// +// //Title VIEW +// mBinding.titleText.setText(titleText); +// +// if (!UtilityString.isNullOrEmpty(hintText)) { +// mBinding.generalInput.setHint(hintText); +// } +// +// if (!UtilityString.isNullOrEmpty(defaultTextValue)) { +// mBinding.generalInput.setText(defaultTextValue); +// } +// if (inputType != null) { +// mBinding.generalInput.setInputType(InputType.TYPE_CLASS_NUMBER); +// } +// //Content View +// dialog.setCancelable(true); +// dialog.setCanceledOnTouchOutside(false); +// dialog.setContentView(mBinding.getRoot()); +// dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); +// UtilityDialog.setTo90PercentWidth(mContext, dialog); +// +// return dialog; + } + + + public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, RunnableArgs onPositiveClick, Runnable onNegativeClick) { return makeBase(mContext, title, @@ -75,7 +122,7 @@ public class DialogSimpleInputHelper { } - public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick) { + public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick) { return makeBase(mContext, title, @@ -87,7 +134,7 @@ public class DialogSimpleInputHelper { } - public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { + public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { return makeBase(mContext, title, @@ -100,7 +147,7 @@ public class DialogSimpleInputHelper { } - public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { + public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { return makeBase(mContext, title, 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 3f924d69..a8e869e8 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 @@ -19,6 +19,11 @@ public class DialogInputQuantityV2DTO { private BigDecimal totalNumCnfOrd; private BigDecimal qtaCnfOrd; + private BigDecimal totalQtaInWarehouse; + private BigDecimal totalNumCnfInWarehouse; + private BigDecimal totalQtaCommitted; + private BigDecimal totalNumCnfCommitted; + private BigDecimal totalQtaToBeTaken; private BigDecimal totalNumCnfToBeTaken; private BigDecimal qtaCnfToBeTaken; @@ -106,6 +111,42 @@ public class DialogInputQuantityV2DTO { return this; } + public BigDecimal getTotalQtaInWarehouse() { + return totalQtaInWarehouse; + } + + public DialogInputQuantityV2DTO setTotalQtaInWarehouse(BigDecimal totalQtaInWarehouse) { + this.totalQtaInWarehouse = totalQtaInWarehouse; + return this; + } + + public BigDecimal getTotalNumCnfInWarehouse() { + return totalNumCnfInWarehouse; + } + + public DialogInputQuantityV2DTO setTotalNumCnfInWarehouse(BigDecimal totalNumCnfInWarehouse) { + this.totalNumCnfInWarehouse = totalNumCnfInWarehouse; + return this; + } + + public BigDecimal getTotalQtaCommitted() { + return totalQtaCommitted; + } + + public DialogInputQuantityV2DTO setTotalQtaCommitted(BigDecimal totalQtaCommitted) { + this.totalQtaCommitted = totalQtaCommitted; + return this; + } + + public BigDecimal getTotalNumCnfCommitted() { + return totalNumCnfCommitted; + } + + public DialogInputQuantityV2DTO setTotalNumCnfCommitted(BigDecimal totalNumCnfCommitted) { + this.totalNumCnfCommitted = totalNumCnfCommitted; + return this; + } + public BigDecimal getTotalQtaToBeTaken() { return UtilityBigDecimal.round(totalQtaToBeTaken); } 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 52fe6128..d72a2869 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 @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.view.dialogs.input_quantity_v2; import android.content.Context; -import android.content.DialogInterface; import android.content.res.ColorStateList; import android.os.Bundle; import android.os.Handler; @@ -16,7 +15,6 @@ import android.view.inputmethod.EditorInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableField; import androidx.fragment.app.DialogFragment; @@ -83,7 +81,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia public ObservableField enabledChangePartitaMag = new ObservableField<>(true); public ObservableField enabledNotes = new ObservableField<>(false); public ObservableField enabledLUCloseButton = new ObservableField<>(true); - private Handler mHandler = new Handler(); + + private final Handler mHandler = new Handler(); private Context context; @@ -110,6 +109,11 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia return this; } + public DialogInputQuantityV2View() { + super(); +// openInFullScreen(); + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -122,7 +126,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { this.context = getActivity(); - mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_v2, container, false); + mBindings = DialogInputQuantityV2Binding.inflate(inflater, container, false); mBindings.setLifecycleOwner(this); mBindings.toolbar.setTitle("Inserimento articolo"); @@ -136,6 +140,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia .setInitialNumCnf(mDialogInputQuantityV2DTO.getInitialNumCnf()) .setInitialQtaCnf(mDialogInputQuantityV2DTO.getInitialQtaCnf()) .setInitialQtaTot(mDialogInputQuantityV2DTO.getInitialQtaTot()) + .setTotalQtaInWarehouse(mDialogInputQuantityV2DTO.getTotalQtaInWarehouse()) + .setTotalNumCnfInWarehouse(mDialogInputQuantityV2DTO.getTotalNumCnfInWarehouse()) + .setTotalQtaCommitted(mDialogInputQuantityV2DTO.getTotalQtaCommitted()) + .setTotalNumCnfCommitted(mDialogInputQuantityV2DTO.getTotalNumCnfCommitted()) .setTotalNumCnfOrd(mDialogInputQuantityV2DTO.getTotalNumCnfOrd()) .setTotalQtaOrd(mDialogInputQuantityV2DTO.getTotalQtaOrd()) .setQtaCnfOrd(mDialogInputQuantityV2DTO.getQtaCnfOrd()) @@ -185,6 +193,14 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia return mBindings.getRoot(); } + @Override + public void onDestroyView() { + super.onDestroyView(); + + BarcodeManager.removeCallback(mBarcodeScannerIstanceID); + if (mAbort) this.mOnAbort.run(); + } + private void initBarcode() { mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() .setOnScanSuccessful(onScanSuccessful) @@ -213,12 +229,12 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } } - @Override - public void onDismiss(@NonNull DialogInterface dialog) { - BarcodeManager.removeCallback(mBarcodeScannerIstanceID); - if (mAbort) this.mOnAbort.run(); - super.onDismiss(dialog); - } +// @Override +// public void onDismiss(@NonNull DialogInterface dialog) { +// BarcodeManager.removeCallback(mBarcodeScannerIstanceID); +// if (mAbort) this.mOnAbort.run(); +// super.onDismiss(dialog); +// } @Override public void onStart() { 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 2f780888..e7d07115 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 @@ -45,6 +45,11 @@ public class DialogInputQuantityV2ViewModel { public BigDecimal totalNumCnfToBeTaken; public BigDecimal qtaCnfToBeTaken; + public BigDecimal totalQtaInWarehouse; + public BigDecimal totalNumCnfInWarehouse; + public BigDecimal totalQtaCommitted; + public BigDecimal totalNumCnfCommitted; + public BigDecimal totalQtaAvailable; public BigDecimal totalNumCnfAvailable; public BigDecimal qtaCnfAvailable; @@ -244,6 +249,26 @@ public class DialogInputQuantityV2ViewModel { return this; } + public DialogInputQuantityV2ViewModel setTotalQtaInWarehouse(BigDecimal totalQtaInWarehouse) { + this.totalQtaInWarehouse = totalQtaInWarehouse; + return this; + } + + public DialogInputQuantityV2ViewModel setTotalNumCnfInWarehouse(BigDecimal totalNumCnfInWarehouse) { + this.totalNumCnfInWarehouse = totalNumCnfInWarehouse; + return this; + } + + public DialogInputQuantityV2ViewModel setTotalQtaCommitted(BigDecimal totalQtaCommitted) { + this.totalQtaCommitted = totalQtaCommitted; + return this; + } + + public DialogInputQuantityV2ViewModel setTotalNumCnfCommitted(BigDecimal totalNumCnfCommitted) { + this.totalNumCnfCommitted = totalNumCnfCommitted; + return this; + } + public DialogInputQuantityV2ViewModel setTotalQtaOrd(BigDecimal totalQtaOrd) { this.totalQtaOrd = totalQtaOrd; return this; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/DialogPrintUlSSCCView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/DialogPrintUlSSCCView.java index ddf9c523..6c913e2f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/DialogPrintUlSSCCView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/DialogPrintUlSSCCView.java @@ -18,7 +18,9 @@ import org.jetbrains.annotations.Nullable; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogPrintUlSsccBinding; import it.integry.integrywmsnative.view.dialogs.printSsccUl.dto.PrintUlDTO; @@ -32,15 +34,19 @@ public class DialogPrintUlSSCCView extends BaseDialogFragment { public static DialogPrintUlSSCCView newInstance( - PrintUlDTO printUlDTO, + String codJcom, MtbColt mtbColt, RunnableArgs onDismiss ) { - return new DialogPrintUlSSCCView(printUlDTO, onDismiss); + return new DialogPrintUlSSCCView(codJcom, mtbColt, onDismiss); } - public DialogPrintUlSSCCView(@NotNull PrintUlDTO printUlDTO, @NotNull RunnableArgs onDismiss) { - this.printUlDTO = printUlDTO; + public DialogPrintUlSSCCView(@NotNull String codJcom, @NotNull MtbColt mtbColt, @NotNull RunnableArgs onDismiss) { this.onDialogClose = onDismiss; + + this.printUlDTO = new PrintUlDTO() + .setMtbColt(mtbColt) + .setFlagPrintShipmentLabel(!UtilityString.isNullOrEmpty(codJcom)) + .setFlagPrintProductionLabel(UtilityString.isNullOrEmpty(codJcom)); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/dto/PrintUlDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/dto/PrintUlDTO.java index 96fc6034..30bf1c7a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/dto/PrintUlDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/dto/PrintUlDTO.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.view.dialogs.printSsccUl.dto; import it.integry.integrywmsnative.core.model.MtbColt; public class PrintUlDTO { + private boolean flagPrintShipmentLabel = false; private boolean flagPrintProductionLabel = false; private MtbColt mtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java index 6ac64921..f43c3fa1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.view.dialogs.scan_or_create_lu; +import android.app.Dialog; import android.content.DialogInterface; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -92,8 +93,6 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial this.mViewModel .setListener(this); - getDialog().setCanceledOnTouchOutside(false); - getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); this.mViewModel.init(mShouldCheckResiduo, mShouldCheckIfExistDoc, mEnableCreation); @@ -110,6 +109,16 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial return mBindings.getRoot(); } + @NonNull + @Override + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + var dialog = super.onCreateDialog(savedInstanceState); + + dialog.setCanceledOnTouchOutside(false); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + return dialog; + } @Override public void onDismiss(@NonNull DialogInterface dialog) { diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml index e1cea0f0..c61d28fc 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml @@ -276,6 +276,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 41fbe1e6..c2c324c4 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -29,7 +29,8 @@ + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> - - + android:layout_height="match_parent" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:itemCount="5" + tools:listitem="@layout/fragment_linee_prod_main_list_model" /> - + + - + - + + + + + android:adjustViewBounds="true" + android:src="@drawable/ic_playlist_add_check_24dp" /> - - - - - + android:text="@string/nessuna_linea_disponibile" + android:textColor="@android:color/black" + android:textSize="18sp" /> + - + - - - - - - + - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml b/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml index 440ad8a1..d417ee6d 100644 --- a/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml +++ b/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml @@ -25,204 +25,200 @@ + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true"> - - + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="10dp" + android:weightSum="2"> + android:layout_height="wrap_content" + android:orientation="horizontal"> - + android:layout_height="wrap_content"> - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + tools:text="In lavorazione" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_menu_item_layout.xml b/app/src/main/res/layout/fragment_main_menu_item_layout.xml index b0e1146f..a3166541 100644 --- a/app/src/main/res/layout/fragment_main_menu_item_layout.xml +++ b/app/src/main/res/layout/fragment_main_menu_item_layout.xml @@ -3,12 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + app:cardCornerRadius="4dp" + app:cardElevation="4dp"> @@ -20,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - Totale ordinato Totale disponibile + Totale impegnato + In magazzino Da prelevare Ord Da ev diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f5cd34f..c3b5302c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -144,6 +144,8 @@ Total ordered Total available + Total committed + In warehouse To be taken Ord To disp