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

Fix su gestione in accettazione da ordine di lavorazione

Browse Source
This commit is contained in:
Giuseppe Scorrano
2021-11-11 13:40:11 +01:00
parent c13eee355e
commit 14252f0f4b
6 changed files with 7 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java
View File

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.class_router;
import java.util.HashMap;
import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.utility.UtilityHashMap;
@@ -10,14 +9,12 @@ public class BaseCustomConfiguration implements ICustomConfiguration {
public static class Keys {
public static int MENU_CONFIGURATION = 0;
public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 1;
public static int CUSTOM_DYNAMIC_VERSION_PATH = 2;
public static int FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC = 3;
}
protected HashMap<Integer, Object> configurations = new HashMap<Integer, Object>() {{
put(Keys.MENU_CONFIGURATION, new MenuConfiguration());
protected HashMap<Integer, Object> configurations = new HashMap<>() {{
put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true);
put(Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC, false);
}};

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

@@ -65,10 +65,7 @@ public class MainAccettazioneFragment extends BaseFragment implements ISearcable
}
public static MainAccettazioneFragment newInstance() {
MainAccettazioneFragment fragment = new MainAccettazioneFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
return new MainAccettazioneFragment();
}

5
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java
View File

@@ -786,9 +786,12 @@ public class AccettazionePickingViewModel {
}
private void printCollo(Runnable onComplete) {
MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
cloneMtbColt.setGestione(cloneMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE ? GestioneEnum.PRODUZIONE : cloneMtbColt.getGestioneEnum());
this.mPrinterRESTConsumer.printCollo(
PrinterRESTConsumer.Type.SECONDARIA,
mCurrentMtbColt,
cloneMtbColt,
() -> {
this.sendLUSuccessfullyPrinted();
onComplete.run();

3
app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
View File

@@ -27,7 +27,6 @@ import javax.inject.Inject;
import it.integry.integrywmsnative.MainApplication;
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.configs.BaseMenuConfiguration;
import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
@@ -242,7 +241,7 @@ public class MainActivity extends BaseActivity
private MenuConfiguration.MenuItem getMenuItem(@IdRes int menuId) {
ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION);
BaseMenuConfiguration menuConfiguration = new MenuConfiguration();
List<MenuConfiguration.MenuGroup> menuGroups = menuConfiguration.getGroups();
BaseMenuConfiguration.MenuItem menuItemToReturn = null;