diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 00000000..adb28554 --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,46 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 58830068..9d51cbaf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -1,6 +1,8 @@ package it.integry.integrywmsnative; import android.content.Intent; + +import androidx.annotation.IdRes; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -22,7 +24,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; -import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IRecyclerFragment; import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment; @@ -102,19 +103,11 @@ public class MainActivity extends AppCompatActivity return true; } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); + public void setItem(@IdRes int menuId) { + mBinding.navView.setCheckedItem(menuId); + onNavigationItemSelected(mBinding.navView.getMenu().findItem(menuId)); - //noinspection SimplifiableIfStatement -// if (id == R.id.action_search) { -// return true; -// } - return super.onOptionsItemSelected(item); } @SuppressWarnings("StatementWithEmptyBody") @@ -128,25 +121,21 @@ public class MainActivity extends AppCompatActivity Fragment fragment = null; int id = item.getItemId(); - if (id == R.id.nav_accettazione) { + if (id == R.id.nav_home) { + this.popToMain(); + } else if (id == R.id.nav_accettazione) { fragment = MainAccettazioneFragment.newInstance(); this.adaptViewToFragment(fragment); - } else if (id == R.id.nav_gallery) { + } else if (id == R.id.nav_spedizione) { fragment = MainVenditaFragment.newInstance(); this.adaptViewToFragment(fragment); - } else if (id == R.id.nav_slideshow) { + } else if (id == R.id.nav_rettifica_giacenze) { fragment = RettificaGiacenzeFragment.newInstance(); this.adaptViewToFragment(fragment); } else if (id == R.id.nav_manage) { fragment = VersamentoMerceFragment.newInstance(); this.adaptViewToFragment(fragment); } - /*else if (id == R.id.nav_share) { - - } else if (id == R.id.nav_send) { - - }*/ - else if(id == R.id.nav_settings){ fragment = new MainSettingsFragment(); 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 e78dc715..fb6ce904 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 @@ -134,16 +134,9 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{ mtbColtToCreate.setSerCollo(customSerCollo); } - Calendar calendar = Calendar.getInstance(); - int currentYear = calendar.get(Calendar.YEAR); - - - String fullYear = "20" + UtilityBarcode.getAnnoColloFromULAnonima(barcode); - - - - if(!fullYear.equalsIgnoreCase("" + currentYear)){ + if(!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcode)) { onFailed.run(new Exception("Per continuare scansiona un'etichetta dell'anno corrente")); + return; } mtbColtToCreate diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java index 0e15e052..e2282f7c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java @@ -9,6 +9,8 @@ import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityLogger; +import it.integry.integrywmsnative.core.utility.UtilityServer; +import it.integry.integrywmsnative.core.utility.UtilityString; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -88,6 +90,11 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer { public static void printCollo(String printerName, MtbColt testataColloToPrint, int quantity, String reportName, Runnable onComplete, RunnableArgs onFailed) { + if(UtilityString.isNullOrEmpty(printerName)) { + onFailed.run(new Exception("Nessuna stampante configurata: valore null")); + return; + } + PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class); printerService.printCollo( printerName, diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index 530d544d..75ec4e7a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.utility; import com.annimon.stream.Stream; +import java.util.Calendar; + import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; @@ -13,6 +15,14 @@ public class UtilityBarcode { return barcodeScanDTO != null && barcodeScanDTO.getType() == BarcodeType.CODE128 && barcodeScanDTO.getStringValue().startsWith("U"); } + public static boolean isEtichettaAnonimaOfCurrentYear(String barcode) { + Calendar calendar = Calendar.getInstance(); + int currentYear = calendar.get(Calendar.YEAR); + + String fullYear = "20" + UtilityBarcode.getAnnoColloFromULAnonima(barcode); + return fullYear.equalsIgnoreCase("" + currentYear); + } + public static boolean isEtichetta128(BarcodeScanDTO barcodeScanDTO){ return barcodeScanDTO != null && (barcodeScanDTO.getType() == BarcodeType.CODE128 || barcodeScanDTO.getType() == BarcodeType.EAN128); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index 70d6e73e..b1026973 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -19,6 +19,11 @@ public class UtilityExceptions { progressDialog.dismiss(); defaultException(context, ex); } + + public static void defaultException(Context context, Exception ex, ProgressDialog progressDialog, boolean sendMail){ + progressDialog.dismiss(); + defaultException(context, ex, sendMail); + } public static void defaultException(Context context, Exception ex){ defaultException(context, ex, false); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiCheckerViewHolder.java b/app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiCheckerViewHolder.java index 9e258c6a..f65b8854 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiCheckerViewHolder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiCheckerViewHolder.java @@ -33,19 +33,19 @@ public class WiFiCheckerViewHolder implements ISingleValueOperationCallback { if(mtbColt == null) { - this.createNewUL(UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()), CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, progressDialog, true, null); - BarcodeManager.enable(); + if(!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) { + UtilityExceptions.defaultException(mActivity, new Exception("Per continuare scansiona un'etichetta dell'anno corrente"), progressDialog, false); + BarcodeManager.enable(); + } else { + this.createNewUL(UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()), CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, progressDialog, true, null); + BarcodeManager.enable(); + } } else { progressDialog.dismiss(); BarcodeManager.enable(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index f0f0061f..d2c108b3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -13,6 +13,8 @@ import net.cachapa.expandablelayout.ExpandableLayout; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; +import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; @@ -97,4 +99,15 @@ public class MainFragment extends Fragment implements ITitledFragment { public String getTitle(Context context) { return context.getString(R.string.app_name); } + + @OnClick(R.id.fast_button_accettazione) + public void onClickAccettazione(View view) { + ((MainActivity) getActivity()).setItem(R.id.nav_accettazione); + } + + @OnClick(R.id.fast_button_spedizione) + public void onClickSpedizione(View view) { + ((MainActivity) getActivity()).setItem(R.id.nav_spedizione); + } + } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java index 83acbe46..a7af3d5c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; @@ -60,7 +61,9 @@ public class VenditaViewModel { BarcodeManager.disable(); final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); - if(UtilityBarcode.isEtichetta128(data)){ + if(UtilityBarcode.isEtichettaAnonima(data)) { + this.executeEtichettaLU(data.getStringValue(), progressDialog); + } else if(UtilityBarcode.isEtichetta128(data)){ this.executeEtichettaEan128(data, progressDialog); } else { progressDialog.dismiss(); @@ -69,8 +72,6 @@ public class VenditaViewModel { }; - - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index c3f290af..59b25dc1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -47,7 +47,9 @@ import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCal import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; import it.integry.integrywmsnative.BR; +import it.integry.integrywmsnative.view.dialogs.DialogAskLivelloPosizione; import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; @@ -342,11 +344,18 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO ColliMagazzinoRESTConsumer.getBySSCC(barcodeScanDTO.getStringValue(), true, false, mtbColt -> { if(mtbColt == null) { - this.createNewUL( - UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()), - CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, progressDialog, - true, true, - null); + + if(!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) { + UtilityExceptions.defaultException(mActivity, new Exception("Per continuare scansiona un'etichetta dell'anno corrente"), progressDialog, false); + BarcodeManager.enable(); + } else { + + this.createNewUL( + UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()), + CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, progressDialog, + true, true, + null); + } } else { this.createNewUL( @@ -733,56 +742,63 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } private void printCollo(ProgressDialog progress) { + DialogAskShouldPrint.make(mActivity, "Packing List", shouldPrint -> { - PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, new ISimpleOperationCallback>() { - @Override - public void onSuccess(List value) { + if(shouldPrint) { + PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, new ISimpleOperationCallback>() { + @Override + public void onSuccess(List value) { - if(value.size() > 0) { - try{ - MtbColt currentMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get(); + if (value.size() > 0) { + try { + MtbColt currentMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get(); - ReportManager.getRightReportNameByMtbColt(currentMtbColt, reportName -> { + ReportManager.getRightReportNameByMtbColt(currentMtbColt, reportName -> { - PrinterRESTConsumer.printCollo( - value.get(0), - currentMtbColt, - 1, reportName, () -> { + PrinterRESTConsumer.printCollo( + value.get(0), + currentMtbColt, + 1, reportName, () -> { - postCloseOperations(); - progress.dismiss(); + postCloseOperations(); + progress.dismiss(); - }, ex -> { + }, ex -> { - progress.dismiss(); - String errorMessage = ex.getMessage(); - DialogSimpleMessageHelper.makeErrorDialog( - mActivity, - new SpannableString(errorMessage), - null, - null, - R.string.button_ignore_print, - () -> postCloseOperations()).show(); - }); + progress.dismiss(); + String errorMessage = ex.getMessage(); + DialogSimpleMessageHelper.makeErrorDialog( + mActivity, + new SpannableString(errorMessage), + null, + null, + R.string.button_ignore_print, + () -> postCloseOperations()).show(); + }); - }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress) - ); - } catch (Exception ex) { - UtilityExceptions.defaultException(mActivity, ex, progress); - postCloseOperations(); + }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress) + ); + } catch (Exception ex) { + UtilityExceptions.defaultException(mActivity, ex, progress); + postCloseOperations(); + } + } else { + progress.dismiss(); + String errorMessage = "Nessuna stampante configurata"; + DialogSimpleMessageHelper.makeWarningDialog(mActivity, new SpannableString(errorMessage), null, () -> postCloseOperations()).show(); + } } - } else { - progress.dismiss(); - String errorMessage = "Nessuna stampante configurata"; - DialogSimpleMessageHelper.makeWarningDialog(mActivity, new SpannableString(errorMessage), null, () -> postCloseOperations()).show(); - } - } - @Override - public void onFailed(Exception ex) { - UtilityExceptions.defaultException(mActivity, ex, progress); + @Override + public void onFailed(Exception ex) { + UtilityExceptions.defaultException(mActivity, ex, progress); + } + }); + } else { + postCloseOperations(); + progress.dismiss(); } - }); + }).show(); } private void deleteCollo(ProgressDialog progress) { @@ -800,6 +816,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO public boolean thereIsAnOpenedUL() { return mArticoliInColloBottomSheetViewModel.mtbColt.get() != null; } + public boolean thereIsAnyRowInUL() { return mArticoliInColloBottomSheetViewModel.mtbColt.get() != null && mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr() != null && @@ -842,7 +859,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO removeListFilter(); refreshOrderBy(true); - } @@ -881,8 +897,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO float qtaEvasaCurrentUL = qtaEvasaCurrentULInMtbColr; - - BigDecimal qtaDaEvadere = item.getQtaOrd().subtract(new BigDecimal(qtaEvasaTotale)); if(qtaDaEvadere.floatValue() < 0) qtaDaEvadere = BigDecimal.ZERO; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java new file mode 100644 index 00000000..3fd2eb45 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java @@ -0,0 +1,50 @@ +package it.integry.integrywmsnative.view.dialogs.ask_should_print; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; + +import androidx.appcompat.app.AlertDialog; +import androidx.databinding.DataBindingUtil; +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.databinding.DialogAskShouldPrintBinding; + +public class DialogAskShouldPrint { + + + private Context currentContext; + + private AlertDialog currentAlert; + + public static AlertDialog make(final Context context, final String nomeEtichetta, RunnableArgs onDialogDismiss) { + return new DialogAskShouldPrint(context, nomeEtichetta, onDialogDismiss).currentAlert; + } + + private DialogAskShouldPrint(Context context, String nomeEtichetta, RunnableArgs onDialogDismiss) { + currentContext = context; + + LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); + DialogAskShouldPrintBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_should_print, null, false); + + final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context) + .setView(bindings.getRoot()); + + currentAlert = alertDialog.create(); + currentAlert.setCanceledOnTouchOutside(false); + + bindings.printMessage.setText("La procedura stamperà una " + nomeEtichetta); + + bindings.buttonConfirm.setOnClickListener(v -> { + currentAlert.dismiss(); + onDialogDismiss.run(true); + }); + + bindings.buttonAbort.setOnClickListener(v -> { + currentAlert.dismiss(); + onDialogDismiss.run(false); + }); + + } + +} diff --git a/app/src/main/res/drawable/ic_download_black_24dp.xml b/app/src/main/res/drawable/ic_download_black_24dp.xml new file mode 100644 index 00000000..492b41d3 --- /dev/null +++ b/app/src/main/res/drawable/ic_download_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml new file mode 100644 index 00000000..70fb2910 --- /dev/null +++ b/app/src/main/res/drawable/ic_home_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_upload_black_24dp.xml b/app/src/main/res/drawable/ic_upload_black_24dp.xml new file mode 100644 index 00000000..d6339722 --- /dev/null +++ b/app/src/main/res/drawable/ic_upload_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/dialog_ask_should_print.xml b/app/src/main/res/layout/dialog_ask_should_print.xml new file mode 100644 index 00000000..43804dc3 --- /dev/null +++ b/app/src/main/res/layout/dialog_ask_should_print.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 2b4bf032..34228f99 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -142,5 +142,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 2e1c24ee..338be150 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -2,16 +2,20 @@ + Mostra UL già create Recupera UL Stampa UL + Stampa Conferma Note Aggiuntive Inserisci eventuali note aggiuntive della tua UL diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f4102b16..43023096 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,6 +41,7 @@ Show already created LU Recover LU Print LU + Print Confirm Additional notes Enter any additional notes in your logistics unit