diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java index 0557c19c..264185c6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java @@ -61,6 +61,8 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComp import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule; import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent; import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule; +import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListComponent; +import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListModule; import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdComponent; import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdModule; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteComponent; @@ -128,7 +130,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr DocInterniEditFormModule.class, DialogSelectDocRowsModule.class, DialogAskClienteModule.class, - DialogEditArticoloModule.class + DialogEditArticoloModule.class, + DialogPrintOrderSSCCListModule.class }) public interface MainApplicationComponent { @@ -216,6 +219,8 @@ public interface MainApplicationComponent { DialogEditArticoloComponent.Factory dialogEditArticoloComponent(); + DialogPrintOrderSSCCListComponent.Factory dialogPrintOrderSSCCListComponent(); + void inject(MainApplication mainApplication); void inject(AppContext mainApplication); 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 97050900..1bb11bd7 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 @@ -11,7 +11,6 @@ import javax.inject.Singleton; import it.integry.integrywmsnative.core.exception.NoPrintersFoundException; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.report.ReportType; import it.integry.integrywmsnative.core.rest.RESTBuilder; @@ -21,6 +20,7 @@ import it.integry.integrywmsnative.core.rest.model.ReportTypeDTO; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityString; +import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -156,10 +156,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer { printReportType(reportType, codMdep, null, params, onComplete, onFailed); } - public void printClosedOrders(List closedOrders, String codMdep, Runnable onComplete, RunnableArgs onFailed) { + public void printClosedOrders(PrintOrderCloseDTO dto, String codMdep, Runnable onComplete, RunnableArgs onFailed) { PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class, 240); - Call> callable = printerService.printClosedOrders(codMdep, closedOrders); + Call> callable = printerService.printClosedOrders(codMdep, dto); callable.enqueue(new Callback<>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java index f4bd2e97..6706bee0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java @@ -2,11 +2,11 @@ package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.rest.model.JasperDTO; import it.integry.integrywmsnative.core.rest.model.ReportTypeDTO; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.POST; @@ -41,7 +41,7 @@ public interface PrinterRESTConsumerService { @POST("wms/printClosedOrders") Call> printClosedOrders( @Query("codMdep") String codMdep, - @Body List closedOrders + @Body PrintOrderCloseDTO printOrderCloseDTO ); } 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 d0a41ab6..86c32edd 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 @@ -270,14 +270,6 @@ public class SettingsManager { .setGestName("PICKING") .setSection("SPEDIZIONE") .setKeySection("FLAG_CAN_SELECT_MULTIPLE_ORDERS")); - stbGestSetupList.add(new StbGestSetup() - .setGestName("PICKING") - .setSection("SPEDIZIONE") - .setKeySection("FLAG_PRINT_PACKING_LIST_ON_CLOSE")); - stbGestSetupList.add(new StbGestSetup() - .setGestName("PICKING") - .setSection("SPEDIZIONE") - .setKeySection("FLAG_PRINT_ETICHETTE_ON_CLOSE")); stbGestSetupList.add(new StbGestSetup() .setGestName("PICKING") .setSection("SPEDIZIONE") @@ -331,8 +323,6 @@ public class SettingsManager { dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class)); dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class)); dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class)); -// dbSettingsModelIstance.setFlagPrintPackingListOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_PACKING_LIST_ON_CLOSE", Boolean.class)); -// dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", Boolean.class)); dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class)); dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class)); dbSettingsModelIstance.setDocInterniCheckFornitore(getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class)); 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 ebf9b083..54b87d73 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 @@ -56,10 +56,12 @@ import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.ActivitySpedizioneBinding; import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity; +import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListView; import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView; import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException; import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; +import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO; import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListAdapter; import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListModel; import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView; @@ -722,11 +724,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo public void onLUPrintError(Exception ex, Runnable onComplete) { this.onLoadingEnded(); DialogSimpleMessageView.makeErrorDialog( - new SpannableString(ex.getMessage()), - null, - null, - R.string.button_ignore_print, - onComplete) + new SpannableString(ex.getMessage()), + null, + null, + R.string.button_ignore_print, + onComplete) .show(getSupportFragmentManager(), "tag"); ; } @@ -747,10 +749,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo public void onMtbColrDeleteRequest(RunnableArgs onComplete) { String text = getResources().getString(R.string.alert_delete_mtb_colr); DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), - null, - () -> onComplete.run(true), - () -> onComplete.run(false) - ) + null, + () -> onComplete.run(true), + () -> onComplete.run(false) + ) .show(getSupportFragmentManager(), "tag"); } @@ -849,12 +851,58 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo }).show(); } + public void askShouldPrintPackingList(PrintOrderCloseDTO printOrderCloseDTO, RunnableArgs onComplete) { + DialogSimpleMessageView.makeInfoDialog( + getResources().getString(R.string.action_close_order), + new SpannableString(getResources().getString(R.string.message_print_packing_list_on_close_order)), + null, + () -> { + printOrderCloseDTO.setFlagPrintPackingList(true); + if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) { + this.askShouldPrintSSCC(printOrderCloseDTO, onComplete); + } else { + onComplete.run(printOrderCloseDTO); + } + }, + () -> { + printOrderCloseDTO.setFlagPrintPackingList(false); + if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) { + this.askShouldPrintSSCC(printOrderCloseDTO, onComplete); + } else { + onComplete.run(printOrderCloseDTO); + } + } + ) + .show(getSupportFragmentManager(), "tag"); + } + + public void askShouldPrintSSCC(PrintOrderCloseDTO printOrderCloseDTO, RunnableArgs onComplete) { + DialogPrintOrderSSCCListView.newInstance(printOrderCloseDTO, onComplete).show(this.getSupportFragmentManager(), "dialogPrintOrderSSCCListView"); + } + @Override public void onBatchLotSelectionRequest(List availableBatchLots, RunnableArgs onComplete) { DialogChooseBatchLotView.newInstance(availableBatchLots, onComplete) .show(getSupportFragmentManager(), "tag"); } + @Override + public void onCloseOrderPrintRequest(RunnableArgs onComplete) { + PrintOrderCloseDTO printOrderCloseDTO = new PrintOrderCloseDTO(); + if (SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) { + this.askShouldPrintPackingList(printOrderCloseDTO, onComplete); + } else if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) { + this.askShouldPrintSSCC(printOrderCloseDTO, onComplete); + } + + } + + @Override + public void onOrderClosed() { + this.onLoadingEnded(); + this.onBackPressed(); + } + @Override public void onRowSaved() { FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); 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 42809d10..be80c0ea 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 @@ -68,6 +68,7 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.NotCurrentYearLUEx import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadException; import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; +import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO; public class SpedizioneViewModel { @@ -304,6 +305,14 @@ public class SpedizioneViewModel { if (this.mListener != null) mListener.onLoadingStarted(); } + private void sendOnCloseOrderPrintRequest(RunnableArgs onComplete) { + if (this.mListener != null) mListener.onCloseOrderPrintRequest(onComplete); + } + + private void sendOnOrderClosed() { + if (this.mListener != null) mListener.onOrderClosed(); + } + private void sendOnLoadingEnded() { if (this.mListener != null) mListener.onLoadingEnded(); } @@ -1853,13 +1862,16 @@ public class SpedizioneViewModel { public void closeOrder() { this.sendOnLoadingStarted(); if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) { - printClosedOrders(this.mTestateOrdini, this::sendOnLoadingEnded, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded)); + this.sendOnCloseOrderPrintRequest(this::onCloseOrderPrintRequest); } } - private void printClosedOrders(List listOrdiniInevasi, Runnable onSuccess, RunnableArgs onAbort) { - HashMap params = new HashMap<>(); - List closedOrders = Stream.of(listOrdiniInevasi).map(ord -> { + private void onCloseOrderPrintRequest(PrintOrderCloseDTO dto) { + if (!dto.isFlagPrintPackingList() && !dto.isFlagPrintSSCC()) { + this.sendOnOrderClosed(); + return; + } + List closedOrders = Stream.of(this.mTestateOrdini).map(ord -> { DtbOrdt ordV = new DtbOrdt(); ordV.setDataOrd(ord.getDataOrdS()) .setNumOrd(ord.getNumOrd()) @@ -1867,9 +1879,15 @@ public class SpedizioneViewModel { .setCodAnag(ord.getCodAnagOrd()); return ordV; }).toList(); + dto.setPrintList(closedOrders); + printClosedOrders(dto, this::sendOnOrderClosed, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded)); + } + + private void printClosedOrders(PrintOrderCloseDTO dto, Runnable onSuccess, RunnableArgs onAbort) { + this.mPrinterRESTConsumer.printClosedOrders( - closedOrders, + dto, SettingsManager.i().getUserSession().getDepo().getCodMdep(), onSuccess, onAbort); @@ -1974,6 +1992,10 @@ public class SpedizioneViewModel { void onLUPositionChangeRequest(RunnableArgss onComplete); void onBatchLotSelectionRequest(List availableBatchLots, RunnableArgs onComplete); + + void onCloseOrderPrintRequest(RunnableArgs onComplete); + + void onOrderClosed(); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListComponent.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListComponent.java new file mode 100644 index 00000000..a33db83c --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListComponent.java @@ -0,0 +1,14 @@ +package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list; + +import dagger.Subcomponent; + +@Subcomponent +public interface DialogPrintOrderSSCCListComponent { + + @Subcomponent.Factory + interface Factory { + DialogPrintOrderSSCCListComponent create(); + } + + void inject(DialogPrintOrderSSCCListView dialogPrintOrderSSCCListView); +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListModule.java new file mode 100644 index 00000000..8dbc4503 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListModule.java @@ -0,0 +1,15 @@ +package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list; + +import dagger.Module; +import dagger.Provides; + +@Module(subcomponents = DialogPrintOrderSSCCListComponent.class) +public class DialogPrintOrderSSCCListModule { + + + @Provides + DialogPrintOrderSSCCListViewModel providesDialogPrintOrderSSCCListViewModel() { + return new DialogPrintOrderSSCCListViewModel(); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListView.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListView.java new file mode 100644 index 00000000..773d9daf --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListView.java @@ -0,0 +1,115 @@ +package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list; + +import android.content.Context; +import android.content.DialogInterface; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.RadioGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.inject.Inject; + +import it.integry.integrywmsnative.MainApplication; +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.databinding.DialogPrintOrderSsccListBinding; +import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO; + +public class DialogPrintOrderSSCCListView extends BaseDialogFragment { + + + @Inject + DialogPrintOrderSSCCListViewModel mViewModel; + + private Context mContext; + private DialogPrintOrderSsccListBinding mBindings; + private final PrintOrderCloseDTO printOrderCloseDTO; + private final RunnableArgs onDialogClose; + + + public static DialogPrintOrderSSCCListView newInstance( + PrintOrderCloseDTO printOrderCloseDTO, + RunnableArgs onDismiss + ) { + return new DialogPrintOrderSSCCListView(printOrderCloseDTO, onDismiss); + } + + public DialogPrintOrderSSCCListView(@NotNull PrintOrderCloseDTO printOrderCloseDTO, @NotNull RunnableArgs onDismiss) { + this.printOrderCloseDTO = printOrderCloseDTO; + this.onDialogClose = onDismiss; + } + + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + this.mContext = getActivity(); + + mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_print_order_sscc_list, container, false); + + MainApplication.appComponent + .dialogPrintOrderSSCCListComponent() + .create() + .inject(this); + mBindings.setView(this); + setCancelable(true); + getDialog().setCanceledOnTouchOutside(true); + getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + return mBindings.getRoot(); + } + + public void onCheckChange(RadioGroup radioGroup, int id) { + this.printOrderCloseDTO.setFlagSkipPrintedSSCC(id == mBindings.printOnlyNew.getId()); + } + + public void onPositiveClick() { + this.printOrderCloseDTO.setFlagPrintSSCC(true); + this.dismiss(); + } + + public void onNegativeClick() { + this.printOrderCloseDTO.setFlagPrintSSCC(false); + this.dismiss(); + } + + @Override + public void onDismiss(@NonNull DialogInterface dialog) { + this.onDialogClose.run(this.printOrderCloseDTO); + super.onDismiss(dialog); + } + + @Override + public void onCancel(@NonNull DialogInterface dialog) { + this.onNegativeClick(); + super.onCancel(dialog); + } + + @Override + public void onStart() { + if (this.printOrderCloseDTO.isFlagSkipPrintedSSCC()) { + mBindings.printOnlyNew.setChecked(true); + } else { + mBindings.printAll.setChecked(true); + } + super.onStart(); + } + + + @Override + public void onError(Exception ex) { + UtilityExceptions.defaultException(this.mContext, ex); + dismiss(); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListViewModel.java new file mode 100644 index 00000000..b516384b --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/print_sscc_list/DialogPrintOrderSSCCListViewModel.java @@ -0,0 +1,6 @@ +package it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list; + +public class DialogPrintOrderSSCCListViewModel { + + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PrintOrderCloseDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PrintOrderCloseDTO.java new file mode 100644 index 00000000..508b0e05 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PrintOrderCloseDTO.java @@ -0,0 +1,48 @@ +package it.integry.integrywmsnative.gest.spedizione.model; + +import java.util.List; + +import it.integry.integrywmsnative.core.model.DtbOrdt; + +public class PrintOrderCloseDTO { + private boolean flagPrintPackingList = false; + private boolean flagPrintSSCC = false; + private boolean flagSkipPrintedSSCC = true; + private List printList; + + public boolean isFlagPrintPackingList() { + return flagPrintPackingList; + } + + public PrintOrderCloseDTO setFlagPrintPackingList(boolean flagPrintPackingList) { + this.flagPrintPackingList = flagPrintPackingList; + return this; + } + + public boolean isFlagPrintSSCC() { + return flagPrintSSCC; + } + + public PrintOrderCloseDTO setFlagPrintSSCC(boolean flagPrintSSCC) { + this.flagPrintSSCC = flagPrintSSCC; + return this; + } + + public boolean isFlagSkipPrintedSSCC() { + return flagSkipPrintedSSCC; + } + + public PrintOrderCloseDTO setFlagSkipPrintedSSCC(boolean flagSkipPrintedSSCC) { + this.flagSkipPrintedSSCC = flagSkipPrintedSSCC; + return this; + } + + public List getPrintList() { + return printList; + } + + public PrintOrderCloseDTO setPrintList(List printList) { + this.printList = printList; + return this; + } +} diff --git a/app/src/main/res/layout/dialog_print_order_sscc_list.xml b/app/src/main/res/layout/dialog_print_order_sscc_list.xml new file mode 100644 index 00000000..072982a3 --- /dev/null +++ b/app/src/main/res/layout/dialog_print_order_sscc_list.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8c33f7c0..d1ea02c3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -267,6 +267,9 @@ Recupero dati Attendi qualche istante + VGAlimenti personalizzazione + Base personalizzazione + IME personalizzazione Stampante Accettazione @@ -277,6 +280,10 @@ Posizionamento Vuoi procedere con la stampa di una %s + Vuoi stampare le packing list degli ordini chiusi? + Vuoi stampare le etichette SSCC degli ordini chiusi? + Stampa solo le nuove etichette + Stampa tutte le etichette Crea nuova UL Visualizza basket Apri UL diff --git a/app/src/main/res/values/buttons_style.xml b/app/src/main/res/values/buttons_style.xml index ab5ce6a4..32a7b14e 100644 --- a/app/src/main/res/values/buttons_style.xml +++ b/app/src/main/res/values/buttons_style.xml @@ -3,46 +3,53 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 798447af..3ed64bb0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -283,6 +283,10 @@ Placement Do you want print a %s? + Do you want print the packing lists of the closed orders? + Do you want print the SSCC labels for the closed orders? + Print only new labels + Print all labels Create new LU View basket Open LU