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

Finish v1_2_1(54)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-05-28 13:13:15 +02:00
commit 8b980a7c13
23 changed files with 109 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 53
def appVersionName = '1.2.0'
def appVersionCode = 54
def appVersionName = '1.2.1'
signingConfigs {
release {

9
app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ISingleOperationDoubleCallback.java
View File

@ -1,9 +0,0 @@
package it.integry.integrywmsnative.core.REST.consumers;
public interface ISingleOperationDoubleCallback<T, U> {
void onSuccess(T firstValue, U secondValue);
void onFailed(Exception ex );
}

7
app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ISingleValueOperationCallback.java
View File

@ -1,7 +0,0 @@
package it.integry.integrywmsnative.core.REST.consumers;
public interface ISingleValueOperationCallback<T> {
void onResult(T value);
}

1
app/src/main/java/it/integry/integrywmsnative/core/REST/watcher/ServerStatusChecker.java
View File

@ -5,7 +5,6 @@ import android.os.Handler;
import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityServer;

5
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityServer.java
View File

@ -5,7 +5,6 @@ import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@ -13,7 +12,7 @@ import okhttp3.Response;
public class UtilityServer {
public static void isHostReachable(final String serverAddress, final int serverTCPport, final ISingleValueOperationCallback<Boolean> callback){
public static void isHostReachable(final String serverAddress, final int serverTCPport, final RunnableArgs<Boolean> callback){
new Thread(() -> {
boolean connected = false;
@ -32,7 +31,7 @@ public class UtilityServer {
socket = null;
}
callback.onResult(connected);
callback.run(connected);
}).start();
}

7
app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiCheckerViewHolder.java
View File

@ -1,13 +1,12 @@
package it.integry.integrywmsnative.core.wifi;
import android.app.Activity;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
public class WiFiCheckerViewHolder implements ISingleValueOperationCallback<WiFiStatusChecker.SIGNAL>{
public class WiFiCheckerViewHolder implements RunnableArgs<WiFiStatusChecker.SIGNAL> {
private TextView mWifiSignalTextView;
@ -30,7 +29,7 @@ public class WiFiCheckerViewHolder implements ISingleValueOperationCallback<WiFi
@Override
public void onResult(WiFiStatusChecker.SIGNAL value) {
public void run(WiFiStatusChecker.SIGNAL value) {
switch (value){
case EXCELLENT:
mWifiSignalTextView.setText("ECCELLENTE");

8
app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiStatusChecker.java
View File

@ -5,7 +5,7 @@ import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Handler;
import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
public class WiFiStatusChecker {
@ -18,7 +18,7 @@ public class WiFiStatusChecker {
NONE
}
private ISingleValueOperationCallback<SIGNAL> mCallback;
private RunnableArgs<SIGNAL> mCallback;
private WifiManager mWifiManager;
private int mNumberOfLevels = 4;
@ -45,7 +45,7 @@ public class WiFiStatusChecker {
default: signal = SIGNAL.NONE; break;
}
mCallback.onResult(signal);
mCallback.run(signal);
handler.postDelayed(this, MILLIS_DELAY);
}
@ -56,7 +56,7 @@ public class WiFiStatusChecker {
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
}
public void startMonitoring(ISingleValueOperationCallback<SIGNAL> callback){
public void startMonitoring(RunnableArgs<SIGNAL> callback){
this.mCallback = callback;
shouldExecute = true;

6
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
View File

@ -182,6 +182,8 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
//Splitto gli ordini di ogni fornitore per data e numero
List<OrdineAccettazioneGroupedInevasoDTO.Ordine> tmpOrd = Stream.of(ordini)
.filter(x -> x.getCodAnagOrd().equals(groupedOrdine.codAnagForn))
.sortBy(x -> x.getDataConsD())
.map(x -> {
OrdineAccettazioneGroupedInevasoDTO.Ordine rigaOrdine = new OrdineAccettazioneGroupedInevasoDTO.Ordine();
@ -194,7 +196,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
rigaOrdine.pesoTotale = x.getPesoTotale();
rigaOrdine.barcode = x.getBarcode();
rigaOrdine.termCons = x.getTermCons();
rigaOrdine.dataCons = x.getDataCons();
rigaOrdine.dataCons = x.getDataConsS();
rigaOrdine.rifOrd = x.getRifOrd();
rigaOrdine.clienti = new ArrayList<>();
@ -218,7 +220,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
cliente.codJcom = x.getCodJcom();
cliente.ragSocCom = x.getRagSocCom();
cliente.descrCom = x.getDescrizioneCom();
cliente.dataCons = x.getDataCons();
cliente.dataCons = x.getDataConsS();
cliente.numCnf = x.getNumCnf();
cliente.rifOrd = x.getRifOrd();

15
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneInevasoDTO.java
View File

@ -1,5 +1,9 @@
package it.integry.integrywmsnative.gest.accettazione.dto;
import java.util.Date;
import it.integry.integrywmsnative.core.utility.UtilityDate;
/**
* Created by GiuseppeS on 06/03/2018.
*/
@ -171,10 +175,19 @@ public class OrdineAccettazioneInevasoDTO {
return this;
}
public String getDataCons() {
public String getDataConsS() {
return dataCons;
}
public Date getDataConsD(){
try {
return UtilityDate.recognizeDate(dataCons);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
public OrdineAccettazioneInevasoDTO setDataCons(String dataCons) {
this.dataCons = dataCons;
return this;

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

@ -20,14 +20,14 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.databinding.ActivityAccettazioneOrdineInevasoBinding;
import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding;
import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel.AccettazioneOnOrdineAccettazioneInevasoViewModel;
import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel.AccettazioneOrdineAccettazioneInevasoViewModel;
import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
public class AccettazioneOrdineInevasoActivity extends AppCompatActivity {
public ActivityAccettazioneOrdineInevasoBinding bindings;
private AccettazioneOnOrdineAccettazioneInevasoViewModel mAccettazioneOrdineInevasoViewModel;
private AccettazioneOrdineAccettazioneInevasoViewModel mAccettazioneOrdineInevasoViewModel;
private ArticoliInColloBottomSheetViewModel mArticoliInColloBottomSheetViewModel;
private static final int PICK_UL_REQUEST = 1; // The request code
@ -43,7 +43,7 @@ public class AccettazioneOrdineInevasoActivity extends AppCompatActivity {
mArticoliInColloBottomSheetViewModel = new ArticoliInColloBottomSheetViewModel(this, bindings);
List<OrdineAccettazioneDTO> orders = DataCache.retrieveItem(getIntent().getStringExtra("key"));
mAccettazioneOrdineInevasoViewModel = new AccettazioneOnOrdineAccettazioneInevasoViewModel(
mAccettazioneOrdineInevasoViewModel = new AccettazioneOrdineAccettazioneInevasoViewModel(
this, mArticoliInColloBottomSheetViewModel, orders);
setSupportActionBar(this.bindings.toolbar);

29
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java → app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
View File

@ -58,7 +58,7 @@ import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
import static br.com.zbra.androidlinq.Linq.stream;
public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColloClosedCallback, IOnOrdineAccettazioneRowDispatchCallback {
public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloClosedCallback, IOnOrdineAccettazioneRowDispatchCallback {
public ObservableField<Boolean> isFabVisible = new ObservableField<>();
@ -76,7 +76,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
private GestioneEnum defaultGestioneOfUL = null;
public AccettazioneOnOrdineAccettazioneInevasoViewModel(AccettazioneOrdineInevasoActivity activity, ArticoliInColloBottomSheetViewModel articoliInColloBottomSheetViewModel, List<OrdineAccettazioneDTO> orders) {
public AccettazioneOrdineAccettazioneInevasoViewModel(AccettazioneOrdineInevasoActivity activity, ArticoliInColloBottomSheetViewModel articoliInColloBottomSheetViewModel, List<OrdineAccettazioneDTO> orders) {
this.mActivity = activity;
this.mArticoliInColloBottomSheetViewModel = articoliInColloBottomSheetViewModel;
this.mOrders = orders;
@ -740,14 +740,16 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
BigDecimal qtaDaEvadere = BigDecimal.ZERO;
BigDecimal qtaDaEvadere;
BigDecimal totalQtaDaEvadere = item.getQtaOrd().subtract(new BigDecimal(qtaEvasa)).subtract(item.getQtaEvasa());
if(item.mtbAart.getColliPedana().compareTo(totalQtaDaEvadere) <= 0) {
qtaDaEvadere = item.mtbAart.getColliPedana();
BigDecimal qtaColliPedana = item.mtbAart.getColliPedana().multiply(item.mtbAart.getQtaCnf());
if(qtaColliPedana.compareTo(totalQtaDaEvadere) <= 0) {
qtaDaEvadere = qtaColliPedana;
} else {
qtaDaEvadere = item.getQtaOrd().subtract(new BigDecimal(qtaEvasa)).subtract(item.getQtaEvasa());
qtaDaEvadere = totalQtaDaEvadere;
}
DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO()
@ -797,11 +799,11 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
dto.setShouldAskDataScad(true);
}
DialogInputQuantity.makeBase(mActivity, dto, true, value -> onOrdineRowDispatched(item, value), null).show();
DialogInputQuantity.makeBase(mActivity, dto, true, (quantityDTO, closeLU) -> onOrdineRowDispatched(item, quantityDTO, closeLU), null).show();
}
}
private void onOrdineRowDispatched(OrdineAccettazioneDTO.Riga item, QuantityDTO quantityDTO){
private void onOrdineRowDispatched(OrdineAccettazioneDTO.Riga item, QuantityDTO quantityDTO, boolean closeLU){
final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting),
mActivity.getText(R.string.loading) + " ...", true);
@ -848,16 +850,9 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
refreshOrderBy(false);
FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT);
// new StatusBarAlert.Builder(mActivity)
// .autoHide(true)
// .withDuration(2500)
// .showProgress(false)
// .withText(R.string.data_saved)
// .withAlertColor(R.color.mainGreen)
// .build();
progress.dismiss();
if(closeLU) onColloClosed(null);
}
@Override

1
app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java
View File

@ -6,7 +6,6 @@ import android.util.Log;
import it.integry.integrywmsnative.core.CommonConst;
import it.integry.integrywmsnative.core.REST.RESTBuilder;
import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback;
import it.integry.integrywmsnative.core.REST.consumers.ISingleOperationDoubleCallback;
import it.integry.integrywmsnative.core.REST.model.EsitoType;
import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse;
import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;

19
app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
View File

@ -19,6 +19,7 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.databinding.FragmentProdVersamentoMaterialeBinding;
import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
@ -70,13 +71,19 @@ public class ProdVersamentoMaterialViewModel {
}
private void choosePosition() {
DialogAskPositionOfLU.makeBase(mContext, null, mtbDepoPosizione -> {
if(mtbDepoPosizione != null && mtbColt.get() != null) {
createColloScarico(mtbDepoPosizione);
DialogAskPositionOfLU.makeBase(mContext, null, (status, mtbDepoPosizione) -> {
if(status == DialogConsts.Results.ABORT) {
((IPoppableActivity)mContext).pop();
} else {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("Si è verificato un errore. Riprovare")),
null, this::openLU).show();
if (mtbDepoPosizione != null && mtbColt.get() != null) {
createColloScarico(mtbDepoPosizione);
} else {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("Si è verificato un errore. Riprovare")),
null, this::openLU).show();
}
}

15
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -56,6 +56,7 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.core.RettificaGiacenz
import it.integry.integrywmsnative.gest.rettifica_giacenze.core.adapter.AutoCompleteFornitoreAdapter;
import it.integry.integrywmsnative.gest.rettifica_giacenze.core.adapter.RettificaGiacenzeMainListAdapter;
import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.FornitoreDTO;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU;
import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArts;
@ -578,12 +579,16 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
switch (result){
case YES:
DialogAskPositionOfLU.makeBase(mContext, mtbColt.get(), mtbDepoPosizione -> {
if(mtbDepoPosizione != null && mtbColt.get() != null) {
Objects.requireNonNull(mtbColt.get()).setPosizione(mtbDepoPosizione.getPosizione());
onComplete.run();
} else {
DialogAskPositionOfLU.makeBase(mContext, mtbColt.get(), (status, mtbDepoPosizione) -> {
if(status == DialogConsts.Results.ABORT) {
onAbort.run();
} else {
if (mtbDepoPosizione != null && mtbColt.get() != null) {
Objects.requireNonNull(mtbColt.get()).setPosizione(mtbDepoPosizione.getPosizione());
onComplete.run();
} else {
onAbort.run();
}
}

1
app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
View File

@ -207,6 +207,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
Stream.of(ordini)
.filter(x -> x.getCodAnagOrd().equalsIgnoreCase(codAnagOrd))
.distinctBy(x -> x.getDataOrdS() + " - " + x.getDataConsS() + " - " + x.getNumOrd())
.sortBy(OrdineVenditaInevasoDTO::getDataConsD)
.forEach(ord -> {

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

@ -706,7 +706,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
if(SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
List<PickingObjectDTO> matchWithPartitaMag = Stream.of(matchPickingObject)
.filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()) &&
Objects.equals(x.getPartitaMag(), pickData.getBatchLot())).toList();
(pickData != null && Objects.equals(x.getPartitaMag(), pickData.getBatchLot()))).toList();
matchPickingObject = matchWithPartitaMag;
@ -1141,11 +1141,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
DialogInputQuantity.makeBase(mActivity, dto, false, value -> onOrdineRowDispatched(item, value), null).show();
DialogInputQuantity.makeBase(mActivity, dto, false, (quantityDTO, closeUL) -> onOrdineRowDispatched(item, quantityDTO, closeUL), null).show();
}
}
private void onOrdineRowDispatched(PickingObjectDTO item, QuantityDTO quantityDTO){
private void onOrdineRowDispatched(PickingObjectDTO item, QuantityDTO quantityDTO, boolean closeUL){
final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting),
mActivity.getText(R.string.loading) + " ...", true);
@ -1208,15 +1208,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT);
// new StatusBarAlert.Builder(mActivity)
// .autoHide(true)
// .withDuration(2500)
// .showProgress(false)
// .withText(R.string.data_saved)
// .withAlertColor(R.color.mainGreen)
// .build();
progress.dismiss();
if(closeUL) onColloClosed(null);
}
@Override

22
app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java
View File

@ -22,6 +22,7 @@ import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsume
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.expansion.RunnableArgss;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
@ -29,6 +30,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityPosizione;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.databinding.DialogAskPositionOfLuBinding;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
public class DialogAskPositionOfLU {
@ -42,18 +44,18 @@ public class DialogAskPositionOfLU {
private Dialog mDialog;
private RunnableArgs<MtbDepoPosizione> onComplete;
private RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete;
private RunnableArgs<Exception> onFailed;
private TextInputLayout livelloTextInputLayout;
private boolean completedFlow = false;
public static Dialog makeBase(final Context context, MtbColt mtbColtToUpdate, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
public static Dialog makeBase(final Context context, MtbColt mtbColtToUpdate, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
return new DialogAskPositionOfLU(context, mtbColtToUpdate, onComplete, onFailed).mDialog;
}
public DialogAskPositionOfLU(Context context, MtbColt mtbColtToUpdate, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
public DialogAskPositionOfLU(Context context, MtbColt mtbColtToUpdate, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
mContext = context;
mtbColt = mtbColtToUpdate;
@ -76,7 +78,7 @@ public class DialogAskPositionOfLU {
mDialog = new Dialog(mContext);
mDialog.setContentView(mBinding.getRoot());
mDialog.setCanceledOnTouchOutside(false);
mDialog.setCancelable(false);
// mDialog.setCancelable(false);
mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
mDialog.setOnShowListener(dialog -> {
@ -131,7 +133,7 @@ public class DialogAskPositionOfLU {
mDialog.setOnDismissListener(dialog -> {
BarcodeManager.removeCallback(barcodeIstanceID);
if(!completedFlow) onComplete.run(null);
if(!completedFlow) onComplete.run(DialogConsts.Results.ABORT, null);
});
}
@ -157,7 +159,7 @@ public class DialogAskPositionOfLU {
updatePosizione(foundPosizione, () -> {
completedFlow = true;
BarcodeManager.enable();
if(onComplete != null) onComplete.run(foundPosizione);
if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione);
}, ex -> {
completedFlow = true;
BarcodeManager.enable();
@ -165,7 +167,7 @@ public class DialogAskPositionOfLU {
});
} else {
completedFlow = true;
if(onComplete != null) onComplete.run(foundPosizione);
if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione);
mDialog.dismiss();
BarcodeManager.enable();
@ -197,7 +199,7 @@ public class DialogAskPositionOfLU {
ColliMagazzinoRESTConsumer.changePosizione(mtbColt, foundPosizione, () -> {
progressDialog.dismiss();
completedFlow = true;
if(onComplete != null) onComplete.run(foundPosizione);
if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione);
mDialog.dismiss();
}, ex -> {
UtilityExceptions.defaultException(mContext, ex, progressDialog);
@ -207,7 +209,7 @@ public class DialogAskPositionOfLU {
});
} else {
completedFlow = true;
if(onComplete != null) onComplete.run(foundPosizione);
if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione);
mDialog.dismiss();
}
@ -237,7 +239,7 @@ public class DialogAskPositionOfLU {
private void onLevelAbort() {
completedFlow = true;
onComplete.run(null);
onComplete.run(DialogConsts.Results.ABORT, null);
mDialog.dismiss();
}

27
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
View File

@ -30,11 +30,11 @@ import java.util.GregorianCalendar;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer;
import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback;
import it.integry.integrywmsnative.core.REST.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.expansion.RunnableArgss;
import it.integry.integrywmsnative.core.model.MtbAart;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityDate;
@ -214,11 +214,17 @@ public class DialogInputQuantity {
private QuantityDTO currentQuantityDto;
private DTO currentDTO;
public static AlertDialog makeBase(final Context context, final DTO dto, boolean canOverflowQuantity, final ISingleValueOperationCallback<QuantityDTO> dialogCallback, final Runnable onAbort) {
return new DialogInputQuantity(context, dto, canOverflowQuantity, dialogCallback, onAbort).currentAlert;
public static AlertDialog makeBase(final Context context, final DTO dto, boolean canOverflowQuantity, final RunnableArgs<QuantityDTO> dialogCallback, final Runnable onAbort) {
return new DialogInputQuantity(context, dto, canOverflowQuantity, false, (quantityDto, closeUL) -> {
dialogCallback.run(quantityDto);
}, onAbort).currentAlert;
}
public DialogInputQuantity(@NotNull Context context, @NotNull final DTO dto, boolean canOverflowQuantity, final ISingleValueOperationCallback<QuantityDTO> dialogCallback, final Runnable onAbort) {
public static AlertDialog makeBase(final Context context, final DTO dto, boolean canOverflowQuantity, final RunnableArgss<QuantityDTO, Boolean> dialogCallback, final Runnable onAbort) {
return new DialogInputQuantity(context, dto, canOverflowQuantity, true, dialogCallback, onAbort).currentAlert;
}
public DialogInputQuantity(@NotNull Context context, @NotNull final DTO dto, boolean canOverflowQuantity, boolean showCloseUL, final RunnableArgss<QuantityDTO, Boolean> dialogCallback, final Runnable onAbort) {
currentContext = context;
currentMtbAart = dto.getMtbAart();
currentDTO = dto;
@ -256,6 +262,8 @@ public class DialogInputQuantity {
if(onAbort != null) onAbort.run();
});
if(showCloseUL) alertDialog.setNeutralButton("Chiudi UL", null);
currentAlert = alertDialog.create();
currentAlert.setCanceledOnTouchOutside(false);
@ -278,7 +286,12 @@ public class DialogInputQuantity {
}, 100);
Button positiveButton = currentAlert.getButton(AlertDialog.BUTTON_POSITIVE);
positiveButton.setOnClickListener(view -> onConfirm(context, currentQuantityDto, dialogCallback));
positiveButton.setOnClickListener(view -> onConfirm(context, currentQuantityDto, dialogCallback, false));
if(showCloseUL) {
Button neutralButton = currentAlert.getButton(AlertDialog.BUTTON_NEUTRAL);
neutralButton.setOnClickListener(view -> onConfirm(context, currentQuantityDto, dialogCallback, true));
}
});
@ -612,7 +625,7 @@ public class DialogInputQuantity {
}
private void onConfirm(Context context, QuantityDTO quantityDTO, ISingleValueOperationCallback<QuantityDTO> dialogCallback){
private void onConfirm(Context context, QuantityDTO quantityDTO, RunnableArgss<QuantityDTO, Boolean> dialogCallback, boolean closeUL){
if(currentDTO.mtbAart.isFlagTracciabilita() && (quantityDTO.batchLot == null || quantityDTO.batchLot.get().trim().length() == 0)){
showBatchLotErrorPrompt(context);
@ -639,7 +652,7 @@ public class DialogInputQuantity {
quantityDTO.batchLot.set(quantityDTO.batchLot.get().toUpperCase());
}
dialogCallback.onResult(quantityDTO);
dialogCallback.run(quantityDTO, closeUL);
currentAlert.dismiss();
}

2
app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml
View File

@ -5,7 +5,7 @@
<variable
name="viewmodel"
type="it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel.AccettazioneOnOrdineAccettazioneInevasoViewModel"/>
type="it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel.AccettazioneOrdineAccettazioneInevasoViewModel"/>
</data>

2
app/src/main/res/layout/dialog_input_quantity_articolo.xml
View File

@ -125,7 +125,7 @@
android:text='@{UtilityNumber.decimalToString(viewmodel.qtaOrd)}'
android:textSize="16sp"
android:textStyle="bold"
android:paddingLeft="4dp"
android:paddingStart="4dp"
tools:text="1200" />
<androidx.appcompat.widget.AppCompatTextView

2
app/src/main/res/values-it/strings.xml
View File

@ -195,7 +195,7 @@
<string name="no">No</string>
<string name="placement">Posizionamento</string>
<string name="message_print_packing_list">Verrà stampata una %s</string>
<string name="message_print_packing_list">Vuoi procedere con la stampa di una %s</string>
<string name="button_create_new_ul">Crea nuova UL</string>
<string name="title_open_lu">Apri UL</string>
<string name="fragment_ultime_consegne_cliente_title">Ultime consegne</string>

2
app/src/main/res/values/strings.xml
View File

@ -198,7 +198,7 @@
<string name="no">No</string>
<string name="placement">Placement</string>
<string name="message_print_packing_list">A %s will be printed</string>
<string name="message_print_packing_list">Do you want print a %s?</string>
<string name="button_create_new_ul">Create new LU</string>
<string name="title_open_lu">Open LU</string>