Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiornato gradle e sistemata stampa in modalità Recupera UL

Browse Source
This commit is contained in:
Giuseppe Scorrano
2019-01-16 15:41:11 +01:00
parent 4c5e885a6c
commit 90b751fbc8
23 changed files with 90 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java
View File

@@ -6,7 +6,6 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.CommonModelConsts;
import it.integry.integrywmsnative.core.model.MtbDepo;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.integrywmsnative.generated.callback.Runnable;
public class DepositoRESTConsumer {

1
app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java
View File

@@ -7,7 +7,6 @@ import it.integry.integrywmsnative.core.REST.model.GestSetupDTO;
import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.integrywmsnative.generated.callback.Runnable;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

4
app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java
View File

@@ -72,8 +72,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
public static void getAvailablePrinters(String codMdep, Type printerType, final ISimpleOperationCallback<List<String>> callback) {
String printerTypeStr = printerType != null ? printerType.toString() : null;
PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
printerService.getAvailablePrinters(codMdep, printerType.toString()).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
@Override
public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
analyzeAnswer(response, "GetAvailablePrinters", callback);

3
app/src/main/java/it/integry/integrywmsnative/core/di/BindableBoolean.java
View File

@@ -2,9 +2,6 @@ package it.integry.integrywmsnative.core.di;
import androidx.databinding.BaseObservable;
import org.parceler.Parcel;
@Parcel
public class BindableBoolean extends BaseObservable {
boolean mValue;

3
app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java
View File

@@ -2,9 +2,6 @@ package it.integry.integrywmsnative.core.di;
import androidx.databinding.BaseObservable;
import org.parceler.Parcel;
@Parcel
public class BindableFloat extends BaseObservable {
Float value;

3
app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
View File

@@ -2,9 +2,6 @@ package it.integry.integrywmsnative.core.di;
import androidx.databinding.BaseObservable;
import org.parceler.Parcel;
@Parcel
public class BindableInteger extends BaseObservable {
Integer value;

3
app/src/main/java/it/integry/integrywmsnative/core/di/BindableString.java
View File

@@ -3,11 +3,8 @@ package it.integry.integrywmsnative.core.di;
import androidx.databinding.BaseObservable;
import androidx.databinding.Observable;
import org.parceler.Parcel;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@Parcel
public class BindableString extends BaseObservable {
String value;

1
app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java
View File

@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.core.report;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.generated.callback.Runnable;
public class ReportManager {

5
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java
View File

@@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.model.MtbColt;
@@ -108,9 +109,7 @@ public class AccettazioneOrdineInevasoActivity extends AppCompatActivity {
public void startListaBancaliRegistratiActivity(ArrayList<MtbColt> mtbColts){
Intent myIntent = new Intent(this, ListaBancaliActivity.class);
myIntent.putExtra("key", mtbColts); //Optional parameters
myIntent.putExtra(ListaBancaliActivity.Key.CanRecoverUL, true);
Intent myIntent = ListaBancaliActivity.createIntent(this, mtbColts, true, PrinterRESTConsumer.Type.SECONDARIA);
this.startActivityForResult(myIntent, PICK_UL_REQUEST);
}

3
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java
View File

@@ -15,7 +15,6 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
import it.integry.integrywmsnative.BR;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.CommonConst;
import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer;
@@ -82,7 +81,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
this.isFabVisible.set(true);
this.mActivity.bindings.setVariable(BR.viewmodel, this);
this.mActivity.bindings.setViewmodel(this);
this.init();
}

34
app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java
View File

@@ -2,14 +2,17 @@ package it.integry.integrywmsnative.gest.contenuto_bancale;
import androidx.databinding.DataBindingUtil;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding;
import it.integry.integrywmsnative.gest.contenuto_bancale.viewmodel.ContenutoBancaleViewModel;
import static it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity.Key.CanRecoverUL;
import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
public class ContenutoBancaleActivity extends AppCompatActivity {
@@ -17,8 +20,19 @@ public class ContenutoBancaleActivity extends AppCompatActivity {
private ContenutoBancaleViewModel mViewModel;
public static class Key {
public static final String CanRecoverUL = "canRecoverUL";
private static class Key {
private static final String MtbColtKey = "mtbColtKey";
private static final String CanRecoverUL = "canRecoverUL";
private static final String PrinterType = "printerType";
}
public static Intent createIntent(Context context, MtbColt item, boolean canRecoverUl, PrinterRESTConsumer.Type printerType) {
Intent myIntent = new Intent(context, ContenutoBancaleActivity.class);
myIntent.putExtra(Key.MtbColtKey, item);
myIntent.putExtra(Key.CanRecoverUL, canRecoverUl);
myIntent.putExtra(Key.PrinterType, printerType);
return myIntent;
}
@Override
@@ -27,9 +41,15 @@ public class ContenutoBancaleActivity extends AppCompatActivity {
bindings = DataBindingUtil.setContentView(this, R.layout.activity_contenuto_bancale);
boolean canRecoverUL = getIntent().getBooleanExtra(CanRecoverUL, false);
MtbColt mtbColt = getIntent().getParcelableExtra("key");
mViewModel = new ContenutoBancaleViewModel(this, mtbColt, canRecoverUL);
boolean canRecoverUL = getIntent().getBooleanExtra(Key.CanRecoverUL, false);
MtbColt mtbColt = getIntent().getParcelableExtra(Key.MtbColtKey);
PrinterRESTConsumer.Type mPrinterType;
if(getIntent().hasExtra(Key.PrinterType)) {
mPrinterType = (PrinterRESTConsumer.Type) getIntent().getSerializableExtra(Key.PrinterType);
} else mPrinterType = null;
mViewModel = new ContenutoBancaleViewModel(this, mtbColt, canRecoverUL, mPrinterType);
bindings.waterfallToolbar.setNestedScrollView(bindings.scrollView);

7
app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java
View File

@@ -40,11 +40,14 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
private ContenutoBancaleListAdapter mAdapter;
public ContenutoBancaleViewModel(ContenutoBancaleActivity context, MtbColt mtbColt, boolean canRecoverUL){
private PrinterRESTConsumer.Type mPrinterType;
public ContenutoBancaleViewModel(ContenutoBancaleActivity context, MtbColt mtbColt, boolean canRecoverUL, PrinterRESTConsumer.Type printerType){
mContext = context;
this.mtbColt = new ObservableField<>(mtbColt);
this.isFabVisible.set(true);
this.isRecoverFabMenuVisible.set(canRecoverUL);
this.mPrinterType = printerType;
mContext.bindings.setViewModel(this);
@@ -97,7 +100,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting),
mContext.getText(R.string.loading) + " ...", true);
PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), new ISimpleOperationCallback<List<String>>() {
PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), mPrinterType, new ISimpleOperationCallback<List<String>>() {
@Override
public void onSuccess(List<String> value) {

34
app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
View File

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.gest.lista_bancali;
import android.content.Context;
import android.content.Intent;
import androidx.databinding.DataBindingUtil;
import androidx.appcompat.app.AppCompatActivity;
@@ -9,17 +10,18 @@ import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding;
import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity;
import it.integry.integrywmsnative.gest.lista_bancali.viewmodel.ListaBancaliViewModel;
import static it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity.Key.CanRecoverUL;
public class ListaBancaliActivity extends AppCompatActivity {
public static class Key {
public static final String CanRecoverUL = "canRecoverUL";
private static class Key {
private static final String MtbColtsKey = "mtbColtsKey";
private static final String CanRecoverUL = "canRecoverUL";
private static final String PrinterType = "printerType";
}
public ActivityListaBancaliBinding bindings;
@@ -27,18 +29,34 @@ public class ListaBancaliActivity extends AppCompatActivity {
private ListaBancaliViewModel mViewModel;
private boolean mCanRecoverUl;
private PrinterRESTConsumer.Type mPrinterType;
private static final int PICK_UL_REQUEST = 1; // The request code
public static Intent createIntent(Context context, ArrayList<MtbColt> items, boolean canRecoverUl, PrinterRESTConsumer.Type printerType) {
Intent myIntent = new Intent(context, ListaBancaliActivity.class);
myIntent.putExtra(Key.MtbColtsKey, items);
myIntent.putExtra(Key.CanRecoverUL, canRecoverUl);
myIntent.putExtra(Key.PrinterType, printerType);
return myIntent;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
bindings = DataBindingUtil.setContentView(this, R.layout.activity_lista_bancali);
mCanRecoverUl = getIntent().getBooleanExtra(CanRecoverUL, false);
List<MtbColt> mtbColts = (ArrayList<MtbColt>)getIntent().getSerializableExtra("key");
mCanRecoverUl = getIntent().getBooleanExtra(Key.CanRecoverUL, false);
if(getIntent().hasExtra(Key.PrinterType)) {
mPrinterType = (PrinterRESTConsumer.Type) getIntent().getSerializableExtra(Key.PrinterType);
} else mPrinterType = null;
List<MtbColt> mtbColts = (ArrayList<MtbColt>)getIntent().getSerializableExtra(Key.MtbColtsKey);
mViewModel = new ListaBancaliViewModel(this, mtbColts);
@@ -55,9 +73,7 @@ public class ListaBancaliActivity extends AppCompatActivity {
}
public void startContenutoBancaleActivity(MtbColt item){
Intent myIntent = new Intent(this, ContenutoBancaleActivity.class);
myIntent.putExtra("key", item); //Optional parameters
myIntent.putExtra(ContenutoBancaleActivity.Key.CanRecoverUL, mCanRecoverUl);
Intent myIntent = ContenutoBancaleActivity.createIntent(this, item, mCanRecoverUl, mPrinterType);
startActivityForResult(myIntent, PICK_UL_REQUEST);
}

5
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java
View File

@@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.model.MtbColt;
@@ -98,9 +99,7 @@ public class VenditaOrdineInevasoActivity extends AppCompatActivity {
public void startListaBancaliRegistratiActivity(ArrayList<MtbColt> mtbColts){
Intent myIntent = new Intent(this, ListaBancaliActivity.class);
myIntent.putExtra("key", mtbColts); //Optional parameters
myIntent.putExtra(ListaBancaliActivity.Key.CanRecoverUL, true);
Intent myIntent = ListaBancaliActivity.createIntent(this, mtbColts, true, PrinterRESTConsumer.Type.SECONDARIA);
this.startActivityForResult(myIntent, PICK_UL_REQUEST);
}

4
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@@ -46,8 +46,6 @@ import it.integry.integrywmsnative.ui.StatusBarAlert;
import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback;
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;
@@ -85,7 +83,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
this.isFabVisible.set(true);
this.mActivity.bindings.setVariable(BR.viewmodel, this);
this.mActivity.bindings.setViewmodel(this);
this.init();
this.initDatiPicking();

6
app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java
View File

@@ -20,7 +20,6 @@ import android.widget.BaseAdapter;
import java.lang.ref.WeakReference;
import java.math.BigDecimal;
import it.integry.integrywmsnative.BR;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -30,6 +29,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityNumber;
import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding;
import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetMtbcolrItemBinding;
import it.integry.integrywmsnative.view.bottomsheet.ArticoliInColloBottomSheetHelper;
import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback;
import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
@@ -235,10 +235,10 @@ public class ArticoliInColloBottomSheetViewModel {
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
ViewDataBinding binding = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_collo_bottom_sheet__mtbcolr_item, parent, false);
FragmentArticoliInColloBottomSheetMtbcolrItemBinding binding = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_collo_bottom_sheet__mtbcolr_item, parent, false);
final MtbColr item = mtbColt.get().getMtbColr().get(position);
binding.setVariable(BR.mtbColr, item);
binding.setMtbColr(item);
binding.executePendingBindings();
if(position % 2 == 1) binding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));