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

Aggiunta personalizzazione per IME.

Browse Source 
Bugfix su ricerca per UL.
This commit is contained in:
Giuseppe Scorrano
2019-06-21 13:06:54 +02:00
parent 411092cf52
commit 8ae5c19820
26 changed files with 344 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java Normal file
View File

@@ -0,0 +1,26 @@
package it.integry.integrywmsnative.core.class_router;
import java.util.HashMap;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.utility.UtilityHashMap;
public class BaseCustomConfiguration implements ICustomConfiguration {
public static class Keys {
public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 0;
}
protected HashMap<Integer, Object> configurations = new HashMap<Integer, Object>() {{
put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true);
}};
@Override
public <T> T getConfig(int key) {
return UtilityHashMap.getValue(configurations, key);
}
}

2
app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java
View File

@@ -2,6 +2,6 @@ package it.integry.integrywmsnative.core.class_router.interfaces;
public interface ICustomConfiguration {
boolean shoudShowCodFornInVendita();
<T>T getConfig(int key);
}

19
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityHashMap.java Normal file
View File

@@ -0,0 +1,19 @@
package it.integry.integrywmsnative.core.utility;
import java.util.HashMap;
public class UtilityHashMap {
public static<T> T getValueIfExists(HashMap map, Object key){
T value = null;
if(map != null && map.containsKey(key)) value = (T) map.get(key);
return value;
}
public static<T> T getValue(HashMap map, Object key){
return (T) map.get(key);
}
}

18
app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
View File

@@ -224,15 +224,15 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
@OnClick(R.id.fast_button_prod_versamento_materiale)
public void onClickProdVersamentoMateriale(View view) {
((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale);
}
@OnClick(R.id.fast_button_prod_recupero_materiale)
public void onClickProdRecuperoMateriale(View view) {
((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale);
}
// @OnClick(R.id.fast_button_prod_versamento_materiale)
// public void onClickProdVersamentoMateriale(View view) {
// ((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale);
// }
//
// @OnClick(R.id.fast_button_prod_recupero_materiale)
// public void onClickProdRecuperoMateriale(View view) {
// ((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale);
// }
@Override
public void setScrollToolbar(ElevatedToolbar toolbar) {

2
app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
View File

@@ -94,7 +94,7 @@ public class VenditaHelper {
String joinedBarcodes = TextUtils.join(",", barcodeOrdini);
OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 60);
OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 90);
Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_v");
perfTrace.start();

4
app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
View File

@@ -106,7 +106,7 @@ public class VenditaViewModel {
if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO) {
if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) {
//GET BY COMMESSA COLLO
mHelper.getOrdiniInCommessaCollo(mtbColt, orderList -> {
@@ -176,7 +176,7 @@ public class VenditaViewModel {
private void showWrongGestioneUL() {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml(mContext.getResources().getText(R.string.gestione_V_not_accepted_message).toString())),
new SpannableString(Html.fromHtml(mContext.getResources().getText(R.string.gestione_A_L_only_accepted_message).toString())),
null, null).show();
}

13
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.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.class_router.BaseCustomConfiguration;
import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.model.MtbColr;
@@ -44,9 +45,13 @@ public class VenditaOrdineInevasoHelper {
for(int i = 0; i < mPickingList.size(); i++) {
mPickingList.get(i).setDeactivated(mPickingList.get(i).getQtaCollo().floatValue() == 0);
mPickingList.get(i).setHidden(false);
mPickingList.get(i).setTempHidden(false);
if(mPickingList.get(i).isHidden() == null || forceHiddenCheck) {
PickingObjectDTO tmpItem = mPickingList.get(i);
tmpItem.setDeactivated(tmpItem.getQtaCollo().floatValue() == 0);
tmpItem.setHidden(false);
tmpItem.setTempHidden(false);
}
}
List<String> listOfKnownPositions = Stream.of(mPickingList)
@@ -122,7 +127,7 @@ public class VenditaOrdineInevasoHelper {
String badge1 = "";
if(customConfiguration.shoudShowCodFornInVendita()) {
if(customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE)) {
badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : "";
badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart());
} else {