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

Finish v1_0_42(45)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-04-03 13:25:01 +02:00
commit e1754cd8ed
12 changed files with 130 additions and 80 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 { android {
def appVersionCode = 44 def appVersionCode = 45
def appVersionName = '1.0.41' def appVersionName = '1.0.42'
signingConfigs { signingConfigs {
release { release {

3
app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java
View File

@ -12,7 +12,8 @@ public class ClassRouter {
public enum PATH { public enum PATH {
FILTRO_ORDINI_VENDITA, FILTRO_ORDINI_VENDITA,
ORDINI_VENDITA ORDINI_VENDITA,
CUSTOM_CONFIGURATION
} }
private static Context context; private static Context context;

7
app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java Normal file
View File

@ -0,0 +1,7 @@
package it.integry.integrywmsnative.core.class_router.interfaces;
public interface ICustomConfiguration {
boolean shoudShowCodFornInVendita();
}

58
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
View File

@ -320,43 +320,47 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
List<MtbColr> destNewMtbColr = new ArrayList<>(); List<MtbColr> destNewMtbColr = new ArrayList<>();
askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> { if(pickedAarts.size() > 0) {
askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
if(destNewMtbColr != null && destNewMtbColr.size() > 0){ if (destNewMtbColr != null && destNewMtbColr.size() > 0) {
MtbColt clonedTestata = (MtbColt) destMtbColt.clone(); MtbColt clonedTestata = (MtbColt) destMtbColt.clone();
ObservableArrayList<MtbColr> mtbColrObservableField = new ObservableArrayList<>(); ObservableArrayList<MtbColr> mtbColrObservableField = new ObservableArrayList<>();
for(int i = 0; i < destNewMtbColr.size(); i++) { for (int i = 0; i < destNewMtbColr.size(); i++) {
MtbColr cloneMtbColr = (MtbColr) destNewMtbColr.get(i).clone(); MtbColr cloneMtbColr = (MtbColr) destNewMtbColr.get(i).clone();
cloneMtbColr cloneMtbColr
.setGestioneRif(cloneMtbColr.getGestione()) .setGestioneRif(cloneMtbColr.getGestione())
.setGestione(null); .setGestione(null);
cloneMtbColr cloneMtbColr
.setSerColloRif(cloneMtbColr.getSerCollo()) .setSerColloRif(cloneMtbColr.getSerCollo())
.setSerCollo(null); .setSerCollo(null);
cloneMtbColr cloneMtbColr
.setNumColloRif(cloneMtbColr.getNumCollo()) .setNumColloRif(cloneMtbColr.getNumCollo())
.setNumCollo(null); .setNumCollo(null);
cloneMtbColr cloneMtbColr
.setDataColloRif(cloneMtbColr.getDataColloS()) .setDataColloRif(cloneMtbColr.getDataColloS())
.setDataCollo(null); .setDataCollo(null);
mtbColrObservableField.add(cloneMtbColr); mtbColrObservableField.add(cloneMtbColr);
}
clonedTestata.setMtbColr(mtbColrObservableField);
saveLU(clonedTestata);
} }
clonedTestata.setMtbColr(mtbColrObservableField); }, () -> {
progressDialog.dismiss();
saveLU(clonedTestata); BarcodeManager.enable();
} });
} else {
}, () -> {
progressDialog.dismiss();
BarcodeManager.enable(); BarcodeManager.enable();
}); }
}, () -> { }, () -> {
progressDialog.dismiss(); progressDialog.dismiss();

12
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java
View File

@ -11,6 +11,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColr;
import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
@ -80,6 +82,8 @@ public class VenditaOrdineInevasoHelper {
public List<VenditaOrdineInevasoListViewModel> getListViewModelPerPosizione(List<List<PickingObjectDTO>> groupedRighe, List<MtbColr> mtbColrs) { public List<VenditaOrdineInevasoListViewModel> getListViewModelPerPosizione(List<List<PickingObjectDTO>> groupedRighe, List<MtbColr> mtbColrs) {
ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
List<VenditaOrdineInevasoListViewModel> listModel = new ArrayList<>(); List<VenditaOrdineInevasoListViewModel> listModel = new ArrayList<>();
for(int i = 0; i < groupedRighe.size(); i++) { for(int i = 0; i < groupedRighe.size(); i++) {
@ -98,8 +102,12 @@ public class VenditaOrdineInevasoHelper {
String badge1 = ""; String badge1 = "";
badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : ""; if(customConfiguration.shoudShowCodFornInVendita()) {
badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart()); badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : "";
badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart());
} else {
badge1 += currentItem.getCodMart();
}
rowModel.setBadge1(badge1); rowModel.setBadge1(badge1);

21
app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
View File

@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.content.DialogInterface;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -55,23 +56,23 @@ public class DialogChooseArtsFromListaArts {
binding.emptyView.setVisibility(listaMtbColr != null && listaMtbColr.size() > 0 ? View.GONE : View.VISIBLE); binding.emptyView.setVisibility(listaMtbColr != null && listaMtbColr.size() > 0 ? View.GONE : View.VISIBLE);
AlertDialog.Builder builder = new AlertDialog.Builder(context);
mDialog = new Dialog(context); builder.setPositiveButton(context.getResources().getText(R.string.confirm), (dialog, which) -> {
mDialog.setContentView(binding.getRoot());
mDialog.setCanceledOnTouchOutside(false);
mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
binding.positiveButton.setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
onPositiveClick(); onPositiveClick();
}); });
builder.setNegativeButton(context.getResources().getText(R.string.abort), (dialog, which) -> {
binding.negativeButton.setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
onNegativeClick(); onNegativeClick();
}); });
builder.setView(binding.getRoot());
mDialog = builder.create();
mDialog.setCanceledOnTouchOutside(false);
mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
initRecyclerView(binding, listaMtbColr); initRecyclerView(binding, listaMtbColr);
} }

80
app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml
View File

@ -9,7 +9,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
app:cardCornerRadius="12dp"
app:cardElevation="0dp"> app:cardElevation="0dp">
<LinearLayout <LinearLayout
@ -37,9 +36,12 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="24dp"> android:paddingTop="24dp"
android:paddingBottom="24dp"
android:paddingStart="8dp"
android:paddingEnd="8dp">
<TextView <TextView
android:id="@+id/title_text" android:id="@+id/title_text"
@ -50,6 +52,7 @@
android:gravity="center_horizontal"/> android:gravity="center_horizontal"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -83,48 +86,49 @@
</RelativeLayout> </RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout <!--<androidx.constraintlayout.widget.ConstraintLayout-->
android:layout_width="match_parent" <!--android:id="@+id/buttons"-->
android:layout_height="wrap_content" <!--android:layout_width="match_parent"-->
android:layout_marginTop="8dp"> <!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="8dp">-->
<androidx.constraintlayout.widget.Guideline <!--<androidx.constraintlayout.widget.Guideline-->
android:id="@+id/center_guideline" <!--android:id="@+id/center_guideline"-->
android:layout_width="wrap_content" <!--android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:orientation="vertical" <!--android:orientation="vertical"-->
app:layout_constraintGuide_percent="0.5"/> <!--app:layout_constraintGuide_percent="0.5"/>-->
<com.google.android.material.button.MaterialButton <!--<com.google.android.material.button.MaterialButton-->
android:id="@+id/negative_button" <!--android:id="@+id/negative_button"-->
android:layout_width="0dp" <!--android:layout_width="0dp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
style="@style/Button.PrimaryOutline" <!--style="@style/Button.PrimaryOutline"-->
android:layout_marginLeft="8dp" <!--android:layout_marginLeft="8dp"-->
android:layout_marginRight="8dp" <!--android:layout_marginRight="8dp"-->
app:layout_constrainedHeight="true" <!--app:layout_constrainedHeight="true"-->
app:layout_constraintTop_toTopOf="parent" <!--app:layout_constraintTop_toTopOf="parent"-->
app:layout_constraintStart_toStartOf="parent" <!--app:layout_constraintStart_toStartOf="parent"-->
app:layout_constraintEnd_toStartOf="@id/center_guideline" <!--app:layout_constraintEnd_toStartOf="@id/center_guideline"-->
android:text="@string/abort"/> <!--android:text="@string/abort"/>-->
<com.google.android.material.button.MaterialButton <!--<com.google.android.material.button.MaterialButton-->
android:id="@+id/positive_button" <!--android:id="@+id/positive_button"-->
android:layout_width="0dp" <!--android:layout_width="0dp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
style="@style/Button.PrimaryFull" <!--style="@style/Button.PrimaryFull"-->
android:layout_marginLeft="8dp" <!--android:layout_marginLeft="8dp"-->
android:layout_marginRight="8dp" <!--android:layout_marginRight="8dp"-->
app:layout_constrainedHeight="true" <!--app:layout_constrainedHeight="true"-->
app:layout_constraintTop_toTopOf="parent" <!--app:layout_constraintTop_toTopOf="parent"-->
app:layout_constraintStart_toStartOf="@id/center_guideline" <!--app:layout_constraintStart_toStartOf="@id/center_guideline"-->
app:layout_constraintEnd_toEndOf="parent" <!--app:layout_constraintEnd_toEndOf="parent"-->
android:text="@string/confirm"/> <!--android:text="@string/confirm"/>-->
</androidx.constraintlayout.widget.ConstraintLayout> <!--</androidx.constraintlayout.widget.ConstraintLayout>-->
</LinearLayout> </LinearLayout>

2
dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
View File

@ -5,6 +5,7 @@ import android.util.Log;
import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.wms.dynamic_customization.extensions.CustomConfiguration;
import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita;
import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; import it.integry.wms.dynamic_customization.extensions.OrdiniVendita;
@ -16,6 +17,7 @@ public class DynamicContext {
try { try {
ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class);
ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class);
ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class);
} catch (Exception ex) { } catch (Exception ex) {
UtilityExceptions.defaultException(context, ex); UtilityExceptions.defaultException(context, ex);
} }

11
dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java Normal file
View File

@ -0,0 +1,11 @@
package it.integry.wms.dynamic_customization.extensions;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
public class CustomConfiguration implements ICustomConfiguration {
@Override
public boolean shoudShowCodFornInVendita() {
return true;
}
}

2
dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
View File

@ -5,6 +5,7 @@ import android.util.Log;
import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.wms.dynamic_customization.extensions.CustomConfiguration;
import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita;
import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; import it.integry.wms.dynamic_customization.extensions.OrdiniVendita;
@ -16,6 +17,7 @@ public class DynamicContext {
try { try {
ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class);
ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class);
ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class);
} catch (Exception ex) { } catch (Exception ex) {
UtilityExceptions.defaultException(context, ex); UtilityExceptions.defaultException(context, ex);
} }

10
dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java Normal file
View File

@ -0,0 +1,10 @@
package it.integry.wms.dynamic_customization.extensions;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
public class CustomConfiguration implements ICustomConfiguration {
@Override
public boolean shoudShowCodFornInVendita() {
return false;
}
}