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

Merge branch 'develop' into feature/Refactoring_Spedizione

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
This commit is contained in:
Giuseppe Scorrano 2020-05-22 17:50:51 +02:00
commit 021f7e9732
10 changed files with 337 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/app_base.xml generated
View File

@ -14,8 +14,6 @@
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />

4
.idea/runConfigurations/app_frudis.xml generated
View File

@ -14,8 +14,6 @@
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />
@ -42,7 +40,7 @@
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native>
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="ADVANCED_PROFILING_ENABLED" value="true" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
</Profilers>

4
.idea/runConfigurations/app_ime.xml generated
View File

@ -11,11 +11,9 @@
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="true" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="false" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />

2
.idea/runConfigurations/app_saporiveri.xml generated
View File

@ -14,8 +14,6 @@
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />

2
.idea/runConfigurations/app_saporiveri_pv.xml generated
View File

@ -14,8 +14,6 @@
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />

2
.idea/runConfigurations/app_vglimenti.xml generated
View File

@ -14,8 +14,6 @@
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />

24
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
View File

@ -207,7 +207,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
});
}
public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt,MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
MtbColt newMtbColt = new MtbColt()
.initDefaultFields()
@ -239,7 +239,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
// onFailed.run(new Exception());
// return;
// }
MtbColr original = sourceMtbColt.getMtbColr().get(0);
MtbColr original = sourceMtbColr;
MtbColr mtbColrClone = new MtbColr();
mtbColrClone
.setNumCollo(null)
@ -538,23 +538,19 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
}
public static void changePosizione(MtbColt testata, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
public static void changePosizione(MtbColt mtbColtToSave, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
MtbColt mtbColtToSaveClone = (MtbColt) mtbColtToSave.clone();
testata.setOperation(CommonModelConsts.OPERATION.UPDATE);
mtbColtToSaveClone.setOperation(CommonModelConsts.OPERATION.UPDATE);
mtbColtToSaveClone.setMtbColr(new ObservableArrayList<>());
if (posizione == null) testata.setPosizione(null);
else testata.setPosizione(posizione.getPosizione());
if (posizione == null) mtbColtToSaveClone.setPosizione(null);
else mtbColtToSaveClone.setPosizione(posizione.getPosizione());
ColliMagazzinoRESTConsumer.saveColloStatic(testata, new ISimpleOperationCallback<MtbColt>() {
@Override
public void onSuccess(MtbColt value) {
ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtToSaveClone, mtbColt -> {
if (onComplete != null) onComplete.run();
}
@Override
public void onFailed(Exception ex) {
}, ex -> {
if (onFailed != null) onFailed.run(ex);
}
});
}

6
app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java
View File

@ -39,10 +39,10 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter<ChooseOrd
private HashMap<CheckableOrdineLavoro, Integer> mDatasetPositions = new HashMap<>();
public ChooseOrdsLavFromListAdapter(Context context, List<ChooseOrdsLavFromListItemModel> myDataset, MtbColt mtbColt) throws ParseException, TimeNotRecognizedException, DateNotRecognizedException {
public ChooseOrdsLavFromListAdapter(Context context, List<ChooseOrdsLavFromListItemModel> myDataset, MtbColt mtbColt, MtbColr mtbColr) throws ParseException, TimeNotRecognizedException, DateNotRecognizedException {
mContext = context;
mMtbColt = mtbColt;
mMtbColr = mtbColt.getMtbColr().get(0);
mMtbColr = mtbColr;
if (myDataset != null) {
mDataset = Stream.of(myDataset)
.withoutNulls()
@ -91,7 +91,7 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter<ChooseOrd
private void calculateMtbColtShare() {
MtbColr mtbColr = mMtbColt.getMtbColr().get(0);
MtbColr mtbColr = mMtbColr;
BigDecimal residuoCol = mtbColr.getQtaCol();
BigDecimal residuoCnf = mtbColr.getNumCnf();
BigDecimal offsetCol = BigDecimal.ZERO.add(residuoCol);

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

@ -11,14 +11,18 @@ import android.widget.Toast;
import androidx.databinding.ObservableField;
import androidx.recyclerview.widget.LinearLayoutManager;
import org.jetbrains.annotations.NotNull;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
import it.integry.integrywmsnative.core.model.MtbAart;
import it.integry.integrywmsnative.core.model.MtbColr;
@ -56,6 +60,7 @@ public class ProdVersamentoMaterialViewModel {
private List<ChooseOrdsLavFromListItemModel> mDataset = new ArrayList<>();
private ChooseOrdsLavFromListAdapter currentAdapter;
public ObservableField<MtbColt> mtbColt = new ObservableField<>();
public MtbColr mMtbColr;
public void init(Activity context, FragmentProdVersamentoMaterialeBinding binding, ProdVersamentoMaterialHelper helper, Runnable onVersamentoCompleted) {
@ -68,6 +73,7 @@ public class ProdVersamentoMaterialViewModel {
}
public void setMtbColr(MtbColr mtbColr) {
mMtbColr = mtbColr;
mBinding.descrArt.setText(mtbColr.getDescrizione());
mBinding.codArt.setText(mtbColr.getCodMart());
mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getRifPartitaMag() != null) ? " - "+ mtbColr.getRifPartitaMag().getDescrizione() : ""));
@ -84,7 +90,6 @@ public class ProdVersamentoMaterialViewModel {
}
}
public void openLU() {
DialogScanOrCreateLU.make(mContext, false, false, true, false, (mtbColt, created) -> {
if (mtbColt == null) {
@ -124,9 +129,13 @@ public class ProdVersamentoMaterialViewModel {
null, this::openLU).show();
return;
} else if (mtbColt.get().getMtbColr().size() > 1) {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("Il collo selezionato contiene più articoli, solo il primo verrà versato in questa sessione. <br> Per versare i colli restanti ripetere l'operazione di versamento.")),
null, null).show();
null, () -> {
cyclicGetOrdiniLavByCollo(mtbColt.get().getMtbColr().iterator(), mtbDepoPosizione);
}).show();
return;
}
MesRESTConsumer.getOrdiniLavorazioneMateriale(mtbDepoPosizione.getPosizione(), getIdMaterialeFromCollo(mtbColt.get()), ordini -> richiediOrdiniPerVersamento(ordini, mtbDepoPosizione), e -> DialogSimpleMessageHelper.makeWarningDialog(mContext,
@ -151,7 +160,6 @@ public class ProdVersamentoMaterialViewModel {
return UtilityString.isNullOrEmpty(articolo.getIdArtEqui()) ? articolo.getCodMart() : articolo.getIdArtEqui();
}
private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) {
Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
@ -162,7 +170,6 @@ public class ProdVersamentoMaterialViewModel {
}), ex -> UtilityExceptions.defaultException(mContext, ex));
}
public void setMtbColt(MtbColt mtbColt) {
this.mtbColt.set(mtbColt);
this.setMtbColr(mtbColt.getMtbColr().get(0));
@ -170,10 +177,11 @@ public class ProdVersamentoMaterialViewModel {
public void resetMtbColt() {
this.mtbColt.set(null);
this.mMtbColr = null;
openLU();
}
public void richiediOrdiniPerVersamento(List<OrdineLavorazioneDTO> ordini, MtbDepoPosizione mtbDepoPosizione) {
private void richiediOrdiniPerVersamento(List<OrdineLavorazioneDTO> ordini, MtbDepoPosizione mtbDepoPosizione) {
if (ordini == null || ordini.size() <= 0) {
mBinding.positiveFab.setVisibility(View.GONE);
@ -200,7 +208,7 @@ public class ProdVersamentoMaterialViewModel {
List<OrdineLavorazioneDTO> ordLavs = currentAdapter.getSelectedItems();
if (ordLavs.size() > 0) {
Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
ColliMagazzinoRESTConsumer.createColliScaricoDaOrdineLavorazione(mtbColt.get(), mtbDepoPosizione, ordLavs, generatedMtbColt -> DialogCommon.showDataSaved(mContext, () -> {
ColliMagazzinoRESTConsumer.createColliScaricoDaOrdineLavorazione(mtbColt.get(), mMtbColr, mtbDepoPosizione, ordLavs, generatedMtbColt -> DialogCommon.showDataSaved(mContext, () -> {
progressDialog.dismiss();
mOnVersamentoCompleted.run();
}), ex -> UtilityExceptions.defaultException(mContext, ex));
@ -216,8 +224,28 @@ public class ProdVersamentoMaterialViewModel {
mBinding.dialogChooseArtsFromListaArtMainList.setLayoutManager(new LinearLayoutManager(mContext));
currentAdapter = new ChooseOrdsLavFromListAdapter(mContext, mDataset, mtbColt.get());
currentAdapter = new ChooseOrdsLavFromListAdapter(mContext, mDataset, mtbColt.get(), mMtbColr);
mBinding.dialogChooseArtsFromListaArtMainList.setAdapter(currentAdapter);
}
private void cyclicGetOrdiniLavByCollo(@NotNull Iterator<MtbColr> righeCollo, MtbDepoPosizione mtbDepoPosizione) {
MtbColr colr = righeCollo.next();
setMtbColr(colr);
MtbAart articolo = colr.getMtbAart();
MesRESTConsumer.getOrdiniLavorazioneMateriale(mtbDepoPosizione.getPosizione(), UtilityString.isNullOrEmpty(articolo.getIdArtEqui()) ? articolo.getCodMart() : articolo.getIdArtEqui(), ordini -> {
if (ordini == null || ordini.isEmpty()) {
if (righeCollo.hasNext()) {
cyclicGetOrdiniLavByCollo(righeCollo, mtbDepoPosizione);
} else {
richiediOrdiniPerVersamento(ordini, mtbDepoPosizione);
}
} else {
richiediOrdiniPerVersamento(ordini, mtbDepoPosizione);
}
}
, e -> DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml(e.getMessage())),
null, this::openLU).show());
}
}

337
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@ -5,6 +5,7 @@ import android.app.Dialog;
import androidx.databinding.ObservableArrayList;
import androidx.databinding.ObservableField;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.SpannableString;
import com.annimon.stream.Stream;
@ -121,7 +122,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
this.initDatiPicking();
}
private void init(){
private void init() {
mArticoliInColloBottomSheetViewModel.setOnCloseColloCallbackListener(this);
mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback((deletedItem) -> {
@ -143,7 +144,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
initRecyclerView();
}
private void initRecyclerView(){
private void initRecyclerView() {
//RecyclerView setup
this.mBindings.venditaOrdineMainList.setHasFixedSize(true);
@ -163,7 +164,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
private void initDatiPicking() {
if(this.mTestateOrdini != null && this.mTestateOrdini.size() > 0){
if (this.mTestateOrdini != null && this.mTestateOrdini.size() > 0) {
//Definizione della gestione collo di default
List<GestioneEnum> foundGestioni = Stream.of(mTestateOrdini)
@ -172,12 +173,12 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.distinctBy(x -> x)
.toList();
if(foundGestioni != null && foundGestioni.size() > 1){
if (foundGestioni != null && foundGestioni.size() > 1) {
DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString(mActivity.getString(R.string.error_multiple_gest)), null, () -> {
mActivity.finish();
}).show();
return;
} else if(foundGestioni != null && foundGestioni.size() == 1){
} else if (foundGestioni != null && foundGestioni.size() == 1) {
defaultGestioneOfUL = foundGestioni.get(0);
} else {
defaultGestioneOfUL = GestioneEnum.VENDITA;
@ -187,7 +188,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
defaultCodMdepOfUL = SettingsManager.i().userSession.depo.getCodMdep();
//Definizione del filtro ordine da applicare a tutti i colli generati
Stream.of(mTestateOrdini).forEach(x -> {
FiltroOrdineDTO filtro = new FiltroOrdineDTO()
@ -196,11 +196,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.setGestioneOrd(x.getGestione())
.setDataCons(x.getDataConsD());
if(!defaultFiltroOrdine.contains(filtro)) defaultFiltroOrdine.add(filtro);
if (!defaultFiltroOrdine.contains(filtro)) defaultFiltroOrdine.add(filtro);
});
//Definizione del codAnag
List<String> foundCodAnag = Stream.of(mTestateOrdini)
.map(OrdineVenditaInevasoDTO::getCodAnagOrd)
@ -208,12 +207,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.distinctBy(x -> x)
.toList();
if(foundCodAnag != null && foundCodAnag.size() == 1){
if (foundCodAnag != null && foundCodAnag.size() == 1) {
defaultCodAnagOfUL = foundCodAnag.get(0);
}
//Definizione del codAnag
List<String> foundRagSoc = Stream.of(mTestateOrdini)
.map(OrdineVenditaInevasoDTO::getRagSocOrd)
@ -221,7 +219,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.distinctBy(x -> x)
.toList();
if(foundRagSoc != null && foundRagSoc.size() == 1){
if (foundRagSoc != null && foundRagSoc.size() == 1) {
defaultRagSocOfUL = foundRagSoc.get(0);
}
@ -233,7 +231,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.distinctBy(x -> x)
.toList();
if(foundRifOrd != null && foundRifOrd.size() == 1){
if (foundRifOrd != null && foundRifOrd.size() == 1) {
defaultRifOrdOfUL = foundRifOrd.get(0);
}
@ -245,7 +243,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.distinctBy(x -> x)
.toList();
if(foundNumOrd != null && foundNumOrd.size() == 1){
if (foundNumOrd != null && foundNumOrd.size() == 1) {
defaultNumOrdOfUL = foundNumOrd.get(0);
}
@ -257,7 +255,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.distinctBy(x -> x)
.toList();
if(foundDataOrd != null && foundDataOrd.size() == 1){
if (foundDataOrd != null && foundDataOrd.size() == 1) {
defaultDataOrdOfUL = foundDataOrd.get(0);
}
@ -269,7 +267,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.distinctBy(x -> x)
.toList();
if(foundCodJfas != null && foundCodJfas.size() == 1){
if (foundCodJfas != null && foundCodJfas.size() == 1) {
defaultCodJFasOfUL = foundCodJfas.get(0);
}
@ -279,11 +277,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
private void onRowItemEdited(MtbColr originalItem, MtbColr editedItem) {
for(int i = 0; i < mPickingList.size(); i++) {
for (int i = 0; i < mPickingList.size(); i++) {
int foundIndex = mPickingList.get(i).getWithdrawRows().indexOf(originalItem);
if(foundIndex >= 0){
if (foundIndex >= 0) {
mPickingList.get(i).getWithdrawRows().set(foundIndex, editedItem);
break;
@ -294,11 +292,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
private void onRowItemDeleted(MtbColr deletedItem) {
for(int i = 0; i < mPickingList.size(); i++) {
for (int i = 0; i < mPickingList.size(); i++) {
int foundIndex = mPickingList.get(i).getWithdrawRows().indexOf(deletedItem);
if(foundIndex >= 0){
if (foundIndex >= 0) {
mPickingList.get(i).getWithdrawRows().remove(foundIndex);
break;
@ -307,7 +305,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
}
private void refreshOrderBy(boolean forceHiddenCheck){
private void refreshOrderBy(boolean forceHiddenCheck) {
try {
List<MtbColr> mtbColrs = mArticoliInColloBottomSheetViewModel.mtbColt.get() != null ? mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr() : null;
@ -325,7 +323,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
public void removeListFilter() {
for(int i = 0; i < mPickingList.size(); i++) {
for (int i = 0; i < mPickingList.size(); i++) {
mPickingList.get(i).setTempHidden(false);
mPickingList.get(i).setTempPickData(null);
}
@ -334,7 +332,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
this.mBindings.filteredArtsInListExpandableLayout.collapse(true);
}
public void recoverUL(MtbColt recoveredMtbColt){
public void recoverUL(MtbColt recoveredMtbColt) {
mtbColtSessionID = ColliDataRecover.startNewSession(recoveredMtbColt, mTestateOrdini);
setULToCurrentContext(recoveredMtbColt);
refreshOrderBy(false);
@ -347,22 +345,22 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
BarcodeManager.disable();
//Se non c'è una UL aperta
if(!thereIsAnOpenedUL()){
if (!thereIsAnOpenedUL()) {
//Se è un'etichetta anonima
if(UtilityBarcode.isEtichettaAnonima(data)){
if (UtilityBarcode.isEtichettaAnonima(data)) {
//Se il collo non esiste allora lo creo associandolo a questa etichetta anonima
//invece se esiste apro un collo nuovo e cerco gli articoli presenti nell'ul
//dell'etichetta anonima
this.executeEtichettaAnonimaNotOpenedLU(data, progressDialog);
} else if(UtilityBarcode.isEanPeso(data)) {
} else if (UtilityBarcode.isEanPeso(data)) {
//Creo una nuova ul e cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
this.createNewUL(null, null, progressDialog, false, false, () -> {
this.executeEtichettaEanPeso(data, progressDialog);
});
} else if(UtilityBarcode.isEtichetta128(data)) {
} else if (UtilityBarcode.isEtichetta128(data)) {
//Creo una nuova ul e cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
this.createNewUL(null, null, progressDialog, false, false, () -> {
@ -374,22 +372,22 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
});
}
} else {
if(UtilityBarcode.isEtichettaAnonima(data)){
if (UtilityBarcode.isEtichettaAnonima(data)) {
//Cerco gli articoli presenti nell'ul dell'etichetta anonima
this.executeEtichettaLU(data.getStringValue(), progressDialog);
} else if(UtilityBarcode.isEanPeso(data)) {
} else if (UtilityBarcode.isEanPeso(data)) {
//Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
this.executeEtichettaEanPeso(data, progressDialog);
} else if(UtilityBarcode.isEtichetta128(data)) {
} else if (UtilityBarcode.isEtichetta128(data)) {
//Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
this.executeEtichettaEan128(data, progressDialog);
} else if(UtilityBarcode.isEtichettaPosizione(data)) {
} else if (UtilityBarcode.isEtichettaPosizione(data)) {
//Cerco l'UL presente all'interno della posizione
this.executeEtichettaPosizione(data.getStringValue(), progressDialog);
@ -404,9 +402,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
private void executeEtichettaAnonimaNotOpenedLU(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) {
ColliMagazzinoRESTConsumer.getBySSCCStatic(barcodeScanDTO.getStringValue(), true, false, mtbColt -> {
if(mtbColt == null) {
if (mtbColt == null) {
if(!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) {
if (!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) {
UtilityExceptions.defaultException(mActivity, new Exception("Per continuare scansiona un'etichetta dell'anno corrente"), progressDialog, false);
BarcodeManager.enable();
} else {
@ -441,13 +439,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(posizione);
if(foundPosizione != null) {
if (foundPosizione != null) {
if(foundPosizione.isFlagMonoCollo()) {
if (foundPosizione.isFlagMonoCollo()) {
PosizioniRESTConsumer.getBancaliInPosizione(foundPosizione, mtbColtList -> {
if(mtbColtList == null || mtbColtList.size() == 0 || mtbColtList.size() > 1) {
if (mtbColtList == null || mtbColtList.size() == 0 || mtbColtList.size() > 1) {
progressDialog.dismiss();
//Nessuna UL trovata oppure più UL nella stessa posizione
@ -487,6 +485,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString("Nessuna posizione trovata con il barcode scansionato"), null, BarcodeManager::enable).show();
}
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
=======
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
}
@ -494,7 +497,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
ColliMagazzinoRESTConsumer.getBySSCCStatic(SSCC, true, false, mtbColt -> {
if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
searchArtFromUL(mtbColt, progressDialog);
} else {
progressDialog.dismiss();
@ -516,14 +519,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
String barcodeProd = null;
if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
if(!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
if(!UtilityString.isNullOrEmpty(ean128Model.Content)) barcodeProd = ean128Model.Content;
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
if (!UtilityString.isNullOrEmpty(ean128Model.Content))
barcodeProd = ean128Model.Content;
if(!UtilityString.isNullOrEmpty(barcodeProd)) {
if (!UtilityString.isNullOrEmpty(barcodeProd)) {
if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)){
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
this.executeEtichettaLU(ean128Model.Sscc, progressDialog);
} else {
@ -541,7 +545,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
progressDialog.dismiss();
BarcodeManager.enable();
}
}, ex-> {
}, ex -> {
UtilityExceptions.defaultException(mActivity, ex, progressDialog);
BarcodeManager.enable();
});
@ -560,15 +564,20 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
}
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
private void loadArticolo(String barcodeProd, PickingObjectDTOOld.PickData pickData, Dialog progressDialog) {
if(barcodeProd.length() == 14) {
=======
private void loadArticolo(String barcodeProd, PickingObjectDTO.PickData pickData, Dialog progressDialog) {
if (barcodeProd.length() == 14) {
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
}
ArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
if(mtbAartList != null && mtbAartList.size() > 0) {
if (mtbAartList != null && mtbAartList.size() > 0) {
// if(!thereIsAnOpenedUL()){
//
@ -618,6 +627,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
//Cerco se devo fare pick dell'articolo tramite codMart perché forse non risulta in nessun collo
//if(matchPickingObject != null && matchPickingObject.size() == 0 && scannedUL.getItem() != null && scannedUL.getItem().size() > 0) {
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
List<String> listOfCodMartsInRowCollo = Stream.of(scannedUL.getMtbColr())
.map(MtbColr::getCodMart)
.withoutNulls()
@ -640,20 +650,62 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
List<MtbColr> matchWithPartitaMag = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart()) &&
Objects.equals(x.getPartitaMag(), tmpPickObj.getPartitaMag())).toList();
=======
List<String> listOfCodMartsInRowCollo = Stream.of(scannedUL.getMtbColr())
.map(MtbColr::getCodMart)
.withoutNulls()
.toList();
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
List<PickingObjectDTO> matchPickingObjectByArt = Stream.of(pickingList)
.filter(x -> //x.getNumCollo() == null &&
(listOfCodMartsInRowCollo.contains(x.getCodMart()) && !alreadyMatchedArts.contains(x.getCodMart())))
.toList();
if (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
for (int i = 0; i < matchPickingObjectByArt.size(); i++) {
PickingObjectDTO tmpPickObj = matchPickingObjectByArt.get(i);
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
PickingObjectDTOOld.PickData pickData = new PickingObjectDTOOld.PickData()
.setMtbPartitaMag(matchRow.getRifPartitaMag())
.setNumCnf(matchRow.getNumCnf())
.setQtaCnf(matchRow.getQtaCnf())
.setQtaTot(matchRow.getQtaCol())
.setSourceMtbColt(scannedUL);
=======
List<MtbColr> matchWithPartitaMag = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart()) &&
Objects.equals(x.getPartitaMag(), tmpPickObj.getPartitaMag())).toList();
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
boolean anyMatch = matchWithPartitaMag.size() > 0;
if(!anyMatch) {
if (!anyMatch) {
matchPickingObjectByArt.remove(i);
i--;
} else {
for(int k = 0; k < matchWithPartitaMag.size(); k++) {
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
PickingObjectDTOOld tmpPickObj = matchPickingObjectByArt.get(i);
List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
=======
for (int k = 0; k < matchWithPartitaMag.size(); k++) {
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
MtbColr matchRow = matchWithPartitaMag.get(k);
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
MtbColr matchRow = matchWithColloRow.get(k);
PickingObjectDTOOld.PickData pickData = new PickingObjectDTOOld.PickData()
=======
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
.setMtbPartitaMag(matchRow.getRifPartitaMag())
.setNumCnf(matchRow.getNumCnf())
.setQtaCnf(matchRow.getQtaCnf())
@ -668,15 +720,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} else {
for (int i = 0; i < matchPickingObjectByArt.size(); i++) {
PickingObjectDTOOld tmpPickObj = matchPickingObjectByArt.get(i);
PickingObjectDTO tmpPickObj = matchPickingObjectByArt.get(i);
List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
for(int k = 0; k < matchWithColloRow.size(); k++) {
for (int k = 0; k < matchWithColloRow.size(); k++) {
MtbColr matchRow = matchWithColloRow.get(k);
PickingObjectDTOOld.PickData pickData = new PickingObjectDTOOld.PickData()
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
.setMtbPartitaMag(matchRow.getRifPartitaMag())
.setNumCnf(matchRow.getNumCnf())
.setQtaCnf(matchRow.getQtaCnf())
@ -690,8 +742,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
//}
matchPickingObject.addAll(matchPickingObjectByArt);
@ -713,8 +763,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.toList();
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
if(SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
List<PickingObjectDTOOld> matchWithPartitaMag = Stream.of(matchPickingObject)
=======
if (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
List<PickingObjectDTO> matchWithPartitaMag = Stream.of(matchPickingObject)
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
.filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()) &&
(pickData != null && pickData.getMtbPartitaMag() != null && Objects.equals(x.getPartitaMag(), pickData.getMtbPartitaMag().getPartitaMag()))).toList();
@ -722,26 +777,33 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
if(matchPickingObject.size() == 1){
if (matchPickingObject.size() == 1) {
matchPickingObject.get(0).setTempPickData(pickData);
}
this.loadMatchedRows(matchPickingObject);
}
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
private void loadMatchedRows(List<PickingObjectDTOOld> matchedRows) {
if(matchedRows == null || matchedRows.size() == 0) {
=======
private void loadMatchedRows(List<PickingObjectDTO> matchedRows) {
if (matchedRows == null || matchedRows.size() == 0) {
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
DialogCommon.showNoArtFoundDialog(mActivity, null);
} else {
for(int i = 0; i < mPickingList.size(); i++) {
if(!matchedRows.contains(mPickingList.get(i))) {
for (int i = 0; i < mPickingList.size(); i++) {
if (!matchedRows.contains(mPickingList.get(i))) {
mPickingList.get(i).setTempHidden(true);
}
}
if(matchedRows.size() == 1 ) {
if (matchedRows.size() == 1) {
if (matchedRows.get(0).getTempPickData() != null &&
matchedRows.get(0).getTempPickData().getSourceMtbColt() != null ) {
matchedRows.get(0).getTempPickData().getSourceMtbColt() != null) {
// MtbColt tempSourceMtbColt = matchedRows.get(0).getTempPickData().getSourceMtbColt();
@ -758,7 +820,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
// refreshOrderBy(false);
// }
} else if(matchedRows.get(0).isDeactivated()) {
} else if (matchedRows.get(0).isDeactivated()) {
applyFilter("");
refreshOrderBy(false);
} else {
@ -782,14 +844,14 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
public void createNewUL(Integer customNumCollo, String customSerCollo, Dialog progress, boolean disablePrint, boolean closeProgress, Runnable onComplete) {
this.mBindings.venditaOrdineInevasoFab.close(true);
if (progress == null){
if (progress == null) {
progress = UtilityProgress.createDefaultProgressDialog(mActivity);
}
progress.show();
MtbColt mtbColt = new MtbColt();
mtbColt.initDefaultFields();
mtbColt .setGestione(defaultGestioneOfUL)
mtbColt.setGestione(defaultGestioneOfUL)
.setSegno(-1)
.setRifOrd(defaultRifOrdOfUL)
.setNumOrd(defaultNumOrdOfUL)
@ -798,15 +860,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.setCodMdep(defaultCodMdepOfUL)
.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
if(defaultGestioneOfUL == GestioneEnum.LAVORAZIONE) {
if (defaultGestioneOfUL == GestioneEnum.LAVORAZIONE) {
mtbColt.setPosizione(defaultCodJFasOfUL);
}
if(customNumCollo != null) {
if (customNumCollo != null) {
mtbColt.setNumCollo(customNumCollo);
}
if(!UtilityString.isNullOrEmpty(customSerCollo)) {
if (!UtilityString.isNullOrEmpty(customSerCollo)) {
mtbColt.setSerCollo(customSerCollo);
}
@ -827,18 +889,18 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
setULToCurrentContext(value);
if(closeProgress) finalProgress.dismiss();
if (closeProgress) finalProgress.dismiss();
FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT);
FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
if(onComplete != null) onComplete.run();
}, ex ->{
if (onComplete != null) onComplete.run();
}, ex -> {
UtilityExceptions.defaultException(mActivity, ex, finalProgress);
});
}
private void setULToCurrentContext(MtbColt mtbColt){
private void setULToCurrentContext(MtbColt mtbColt) {
isFabVisible.set(false);
shouldShowAddExtraItems.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione());
mArticoliInColloBottomSheetViewModel.mtbColt.set(mtbColt);
@ -852,7 +914,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
@Override
public void onColloClosed(Runnable onComplete, boolean shouldPrint) {
if(thereIsAnOpenedUL()) {
if (thereIsAnOpenedUL()) {
final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
@ -860,12 +922,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
ColliMagazzinoRESTConsumer.canLUBeDeletedStatic(currentMtbColt, canBeDeleted -> {
if(!canBeDeleted) {
if (!canBeDeleted) {
Runnable saveAction = () -> {
ColliMagazzinoRESTConsumer.updateDataFineStatic(
currentMtbColt,
() -> distribuisciCollo(progress, (generatedMtbColts) -> {
if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete);
if (shouldPrint)
printCollo(progress, generatedMtbColts, onComplete);
else {
postCloseOperations(generatedMtbColts, onComplete);
progress.dismiss();
@ -873,7 +936,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}), ex -> UtilityExceptions.defaultException(mActivity, ex, progress));
};
if(SettingsManager.iDB().isFlagAskPesoColloSpedizione()) {
if (SettingsManager.iDB().isFlagAskPesoColloSpedizione()) {
DialogInputPeso.make(mActivity, currentMtbColt.getCodTcol(), currentMtbColt.getPesoNettoKg(), currentMtbColt.getPesoKg(), (newCodTcol, newNetWeight, newGrossWeight) -> {
@ -887,7 +950,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
saveAction.run();
}
} else {
if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
if (mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
deleteCollo(progress, onComplete);
}
@ -897,7 +960,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
});
} else {
if(onComplete != null) onComplete.run();
if (onComplete != null) onComplete.run();
}
}
@ -911,7 +974,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
ordiniVendita.distribuisciCollo(cloneMtbColt, mTestateOrdini, mtbColts -> {
if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
if (mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
ColliMagazzinoRESTConsumer.getMultipleByTestateStatic(mtbColts, true, onComplete::run, ex -> {
UtilityExceptions.defaultException(mActivity, ex, progress);
@ -925,8 +988,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
private void printCollo(Dialog progress, List<MtbColt> mtbColtsToPrint, Runnable onComplete) {
DialogAskShouldPrint.make(mActivity, "Packing List", shouldPrint -> {
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
if(shouldPrint) {
PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, value -> {
=======
if (shouldPrint) {
PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, value -> {
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
if (value.size() > 0) {
try {
@ -966,7 +1034,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
private void cyclicPrint(@NotNull Iterator<MtbColt> sourceMtbColts, String printerName, Runnable onComplete, RunnableArgs<Exception> onAbort) {
if(sourceMtbColts.hasNext()){
if (sourceMtbColts.hasNext()) {
singlePrint(sourceMtbColts.next(), printerName, () -> {
cyclicPrint(sourceMtbColts, printerName, onComplete, onAbort);
}, onAbort);
@ -978,6 +1046,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
private void singlePrint(MtbColt mtbColtToPrint, String printerName, Runnable onComplete, RunnableArgs<Exception> onFailed) {
ReportManager.getRightReportNameByGestione(mtbColtToPrint.getGestioneEnum(), reportName -> {
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
PrinterRESTConsumer.printCollo(
printerName,
mtbColtToPrint,
@ -985,6 +1054,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
reportName, onComplete, onFailed);
}, onFailed);
=======
PrinterRESTConsumer.printCollo(
printerName,
mtbColtToPrint,
1,
reportName, onComplete, onAbort);
}, onAbort);
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
}
@ -999,7 +1077,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
progress.dismiss();
if(onComplete != null) onComplete.run();
if (onComplete != null) onComplete.run();
}, ex -> UtilityExceptions.defaultException(mActivity, ex, progress)
);
}
@ -1024,9 +1102,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
shouldShowAddExtraItems.set(false);
for(int i = 0; i < this.mPickingList.size(); i++) {
for (int i = 0; i < this.mPickingList.size(); i++) {
for(int k = 0; k < this.mPickingList.get(i).getWithdrawRows().size(); k++) {
for (int k = 0; k < this.mPickingList.get(i).getWithdrawRows().size(); k++) {
MtbColr withdrawRow = this.mPickingList.get(i).getWithdrawRows().get(k);
@ -1043,13 +1121,18 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
removeListFilter();
refreshOrderBy(true);
if(onComplete != null) onComplete.run();
if (onComplete != null) onComplete.run();
}
@Override
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
public void onOrdineRowDispatch(final PickingObjectDTOOld item) {
if(mArticoliInColloBottomSheetViewModel.mtbColt.get() != null){
=======
public void onOrdineRowDispatch(final PickingObjectDTO item) {
if (mArticoliInColloBottomSheetViewModel.mtbColt.get() != null) {
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
List<MtbColr> currentMtbColrs = mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr();
@ -1069,11 +1152,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
BigDecimal qtaDaEvadere = item.getQtaOrd().subtract(qtaEvasaTotaleInMtbColr);
if(qtaDaEvadere.floatValue() < 0) qtaDaEvadere = BigDecimal.ZERO;
if (qtaDaEvadere.floatValue() < 0) qtaDaEvadere = BigDecimal.ZERO;
int numCnfDaEvadere = item.getNumCnfOrd().intValue() - numCnfTotaleInMtbColr;
if(numCnfDaEvadere < 0) numCnfDaEvadere = 0;
if (numCnfDaEvadere < 0) numCnfDaEvadere = 0;
AtomicBigDecimal qtaColEvasaInCurrentUL = new AtomicBigDecimal();
@ -1095,11 +1177,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
BigDecimal numCnfDisponibile = (item.isDeactivated() ? item.getNumCnfOrd() : item.getNumCnfDisponibileCollo()).subtract(numCnfEvasaInCurrentUL.get());
BigDecimal numCnfTot = (item.isDeactivated() ? item.getNumCnfOrd() : item.getNumCnfCollo()).subtract(numCnfEvasaInCurrentUL.get());
if(qtaDisponibile.floatValue() < 0) qtaDisponibile = BigDecimal.ZERO;
if(qtaTot.floatValue() < 0) qtaTot = BigDecimal.ZERO;
if (qtaDisponibile.floatValue() < 0) qtaDisponibile = BigDecimal.ZERO;
if (qtaTot.floatValue() < 0) qtaTot = BigDecimal.ZERO;
if(numCnfDisponibile.floatValue() < 0) numCnfDisponibile = BigDecimal.ZERO;
if(numCnfTot.floatValue() < 0) numCnfTot = BigDecimal.ZERO;
if (numCnfDisponibile.floatValue() < 0) numCnfDisponibile = BigDecimal.ZERO;
if (numCnfTot.floatValue() < 0) numCnfTot = BigDecimal.ZERO;
DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO()
.setBatchLot(item.getPartitaMag())
@ -1115,16 +1197,21 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
boolean batchLotEnabled = true;
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
if(item.getTempPickData() != null) {
PickingObjectDTOOld.PickData tmpPickData = item.getTempPickData();
=======
if (item.getTempPickData() != null) {
PickingObjectDTO.PickData tmpPickData = item.getTempPickData();
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
if(tmpPickData.getQtaCnf() == null && tmpPickData.getNumCnf() != null && tmpPickData.getQtaTot() != null) {
if (tmpPickData.getQtaCnf() == null && tmpPickData.getNumCnf() != null && tmpPickData.getQtaTot() != null) {
tmpPickData.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf(), 3, RoundingMode.HALF_EVEN));
}
boolean isTakenFromUL = tmpPickData.getSourceMtbColt() != null;
if(tmpPickData.getMtbPartitaMag() != null) {
if (tmpPickData.getMtbPartitaMag() != null) {
if (!UtilityString.isNullOrEmpty(tmpPickData.getMtbPartitaMag().getPartitaMag())) {
dto.setBatchLot(tmpPickData.getMtbPartitaMag().getPartitaMag());
@ -1140,8 +1227,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
boolean useQtaDaEvadere = false;
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
if(tmpPickData.getQtaTot() != null) {
useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissaBoolean();
=======
if (tmpPickData.getQtaTot() != null) {
useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa();
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
if (useQtaDaEvadere && !isTakenFromUL) {
dto.setQtaTot(qtaDaEvadere);
dto.setMaxQta(qtaDaEvadere);
@ -1151,7 +1243,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
// }
} else {
if(SettingsManager.iDB().isFlagForceAllToColli()) {
if (SettingsManager.iDB().isFlagForceAllToColli()) {
int numCnfColDaEvadere = numCnfDaEvadere < tmpPickData.getNumCnf().intValue() ? numCnfDaEvadere : tmpPickData.getNumCnf().intValue();
dto.setNumCnf(numCnfColDaEvadere);
@ -1163,7 +1255,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
dto.setQtaTot(qtaDaEvadere.compareTo(tmpPickData.getQtaTot()) < 0 && !tmpPickData.isEanPeso() ? qtaDaEvadere : tmpPickData.getQtaTot());
dto.setMaxQta(tmpPickData.getQtaTot());
if(tmpPickData.getNumCnf() != null) {
if (tmpPickData.getNumCnf() != null) {
dto.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf(), 3, RoundingMode.HALF_UP));
} else {
dto.setQtaCnf(tmpPickData.getQtaTot());
@ -1171,8 +1263,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
}
if (tmpPickData.getQtaCnf() != null && useQtaDaEvadere) {
@ -1181,12 +1271,12 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
if(dto.getQtaDaEvadere() != null && dto.getQtaDaEvadere().floatValue() > 0 && dto.getQtaCnf() != null && dto.getQtaCnf().floatValue() > 0) {
if(useQtaDaEvadere && (dto.getQtaDaEvadere() != null && dto.getQtaDaEvadere().floatValue() > 0)) {
if (dto.getQtaDaEvadere() != null && dto.getQtaDaEvadere().floatValue() > 0 && dto.getQtaCnf() != null && dto.getQtaCnf().floatValue() > 0) {
if (useQtaDaEvadere && (dto.getQtaDaEvadere() != null && dto.getQtaDaEvadere().floatValue() > 0)) {
dto.setNumCnf(dto.getQtaDaEvadere().divide(dto.getQtaCnf(), 3, RoundingMode.HALF_EVEN).intValue());
} else {
dto.setNumCnf((dto.getQtaTot().compareTo(dto.getQtaDaEvadere()) < 0 ? dto.getQtaTot() : dto.getQtaDaEvadere()).divide(dto.getQtaCnf(), RoundingMode.HALF_UP).intValue());
if(dto.getNumCnf() == 0) dto.setNumCnf(1);
if (dto.getNumCnf() == 0) dto.setNumCnf(1);
}
}
@ -1196,15 +1286,18 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
BigDecimal qtaCnf = null;
if(item.getQtaCnfOrd() != null) {
if (item.getQtaCnfOrd() != null) {
qtaCnf = item.getQtaCnfOrd();
} else if(item.getQtaCnfCollo() != null) {
} else if (item.getQtaCnfCollo() != null) {
qtaCnf = item.getQtaCnfCollo();
} else if(item.getMtbAart() != null){
} else if (item.getMtbAart() != null) {
qtaCnf = item.getMtbAart().getQtaCnf();
}
if(qtaDaEvadere.compareTo(BigDecimal.ZERO) > 0) {
if (qtaDisponibile != null && qtaDisponibile.compareTo(BigDecimal.ZERO) > 0) {
dto.setNumCnf(qtaDisponibile.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
} else if (qtaDaEvadere.compareTo(BigDecimal.ZERO) > 0) {
dto.setNumCnf(qtaDaEvadere.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
}
@ -1213,7 +1306,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
boolean canOverflowQuantity = SettingsManager.iDB().isFlagCanAddExtraQuantitySpedizione();
if(!batchLotEnabled) {
if (!batchLotEnabled) {
this.showBatchLotDisabledWarning(dto.getBatchLot(), () -> {
DialogInputQuantity.makeBase(mActivity, dto, canOverflowQuantity, (quantityDTO, closeUL) -> onOrdineRowDispatched(item, quantityDTO, closeUL), null).show();
}, null);
@ -1223,7 +1316,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
}
<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
private void onOrdineRowDispatched(PickingObjectDTOOld item, QuantityDTO quantityDTO, boolean closeUL){
=======
private void onOrdineRowDispatched(PickingObjectDTO item, QuantityDTO quantityDTO, boolean closeUL) {
>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
final MtbColr mtbColr = new MtbColr()
@ -1235,7 +1332,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.setDescrizione(item.getDescrizioneEstesa())
.setDatetimeRow(UtilityDate.getDateInstance());
if(item.getTempPickData() != null && item.getTempPickData().getSourceMtbColt() != null) {
if (item.getTempPickData() != null && item.getTempPickData().getSourceMtbColt() != null) {
MtbColt sourceMtbColt = item.getTempPickData().getSourceMtbColt();
mtbColr
@ -1247,7 +1344,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
MtbColt currentOpenedMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get();
if( currentOpenedMtbColt.getCodTcol() == null &&
if (currentOpenedMtbColt.getCodTcol() == null &&
currentOpenedMtbColt.getPesoKg() == null &&
currentOpenedMtbColt.getPesoNettoKg() == null) {
@ -1256,7 +1353,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
currentOpenedMtbColt.setPesoNettoKg(sourceMtbColt.getPesoNettoKg());
}
} else if(item.getNumCollo() != null) {
} else if (item.getNumCollo() != null) {
mtbColr
.setCodJcom(UtilityString.empty2null(item.getCodJcom()))
.setSerColloRif(UtilityString.empty2null(item.getSerCollo()))
@ -1277,10 +1374,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
boolean shouldPrint = true;
//Se è l'unico articolo del collo
if(closeUL && mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr().size() == 0) {
if (closeUL && mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr().size() == 0) {
// this.addTipoPedanaFromArt(item, cloneMtbColt, closeUL, progress);
shouldPrint = false;
if(UtilityString.isNullOrEmpty(cloneMtbColt.getCodTcol())) {
if (UtilityString.isNullOrEmpty(cloneMtbColt.getCodTcol())) {
cloneMtbColt.setCodTcol(item.getCodTcol());
cloneMtbColt.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
}
@ -1290,13 +1387,12 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
onOrdineRowSave(item, cloneMtbColt, closeUL, !shouldPrint, progress);
}
private void addTipoPedanaFromArt(PickingObjectDTOOld item, MtbColt cloneMtbColt, boolean closeUL, Dialog progress) {
String codTcol = item.getCodTcol();
if(codTcol != null) {
if (codTcol != null) {
MagazzinoRESTConsumer.getTipoCollo(codTcol, mtbTcol -> {
if (mtbTcol != null) {
final MtbColr mtbColr = new MtbColr()
@ -1343,11 +1439,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
removeListFilter();
FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT);
FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
progress.dismiss();
if(closeUL) onColloClosed(null, !hasTipoCollo);
if (closeUL) onColloClosed(null, !hasTipoCollo);
}, ex -> {
UtilityExceptions.defaultException(mActivity, ex, progress);
});
@ -1356,14 +1452,14 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
private void addExtraItem() {
DialogScanArt.make(mActivity, (status, mtbAart, ean128Model) -> {
if(status == DialogConsts.Results.YES) {
if (status == DialogConsts.Results.YES) {
this.dispatchExtraItem(mtbAart, ean128Model);
}
}).show();
}
private void dispatchExtraItem(MtbAart mtbAart, Ean128Model ean128Model){
private void dispatchExtraItem(MtbAart mtbAart, Ean128Model ean128Model) {
DialogInputQuantity.DTO qtaDto = new DialogInputQuantity.DTO();
qtaDto.setMtbAart(mtbAart);
@ -1379,17 +1475,17 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
qtaDto.setCanDataScadBeChanged(true);
if(ean128Model != null){
if(!UtilityString.isNullOrEmpty(ean128Model.BatchLot)) {
if (ean128Model != null) {
if (!UtilityString.isNullOrEmpty(ean128Model.BatchLot)) {
qtaDto.setBatchLot(ean128Model.BatchLot);
qtaDto.setCanPartitaMagBeChanged(false);
}
try {
if(!UtilityString.isNullOrEmpty(ean128Model.BestBefore)){
if (!UtilityString.isNullOrEmpty(ean128Model.BestBefore)) {
qtaDto.setDataScad(UtilityDate.recognizeDate(ean128Model.BestBefore));
qtaDto.setCanDataScadBeChanged(false);
} else if(!UtilityString.isNullOrEmpty(ean128Model.Expiry)) {
} else if (!UtilityString.isNullOrEmpty(ean128Model.Expiry)) {
qtaDto.setDataScad(UtilityDate.recognizeDate(ean128Model.Expiry));
qtaDto.setCanDataScadBeChanged(false);
}
@ -1399,7 +1495,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}
if(ean128Model.Count != null && ean128Model.Count > 0) {
if (ean128Model.Count != null && ean128Model.Count > 0) {
qtaDto.setNumCnf(ean128Model.Count);
}
@ -1421,7 +1517,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}).show();
}
private void onExtraItemDispatched(MtbAart item, QuantityDTO quantityDTO, boolean closeUL){
private void onExtraItemDispatched(MtbAart item, QuantityDTO quantityDTO, boolean closeUL) {
final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
final MtbColr mtbColr = new MtbColr()
@ -1460,23 +1556,20 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
removeListFilter();
FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT);
FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
progress.dismiss();
if(closeUL) onColloClosed(null, true);
if (closeUL) onColloClosed(null, true);
}, ex -> {
UtilityExceptions.defaultException(mActivity, ex, progress);
});
}
public void manualSearch() {
BarcodeManager.disable();
DialogSimpleInputHelper.makeInputDialog(mActivity,"Inserisci il codice a barre", codice->{
DialogSimpleInputHelper.makeInputDialog(mActivity, "Inserisci il codice a barre", codice -> {
this.onScanSuccessfull.run(new BarcodeScanDTO().setStringValue(codice).setType(BarcodeType.CODE128));