From 730d2ec7b3365ec10d4d74c68c394c8a2e4afef2 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 10 Mar 2020 17:34:05 +0100 Subject: [PATCH 1/3] Aggiunto IDViaggio in GetPickingList --- .../core/utility/UtilityExceptions.java | 4 +- .../vendita/core/MainListVenditaAdapter.java | 11 ++ .../gest/vendita/core/VenditaHelper.java | 3 +- .../gest/vendita/dto/GetPickingListDTO.java | 9 ++ app/src/main/res/drawable/ic_black_truck.png | Bin 0 -> 1135 bytes .../layout/vendita_main_list_group_model.xml | 109 ++++++++++++------ ext_sources/ICONS/icons8-camion-96.png | Bin 0 -> 1135 bytes 7 files changed, 98 insertions(+), 38 deletions(-) create mode 100644 app/src/main/res/drawable/ic_black_truck.png create mode 100644 ext_sources/ICONS/icons8-camion-96.png diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index 976394c3..44e5338c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -16,12 +16,12 @@ public class UtilityExceptions { public static void defaultException(Context context, Exception ex, Dialog progressDialog){ - progressDialog.dismiss(); + if(progressDialog != null) progressDialog.dismiss(); defaultException(context, ex); } public static void defaultException(Context context, Exception ex, Dialog progressDialog, boolean sendMail){ - progressDialog.dismiss(); + if(progressDialog != null) progressDialog.dismiss(); defaultException(context, ex, sendMail); } public static void defaultException(Context context, Exception ex){ diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java index 776f6ef7..3b3c89cf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java @@ -139,6 +139,17 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index 8f4d1246..640db048 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -138,7 +138,8 @@ public class VenditaHelper { .setData(x.getDataOrdS()) .setGestione(x.getGestione()) .setNumero(x.getNumOrd()) - .setDataConsegna(x.getDataConsS())) + .setDataConsegna(x.getDataConsS()) + .setIdViaggio(x.getIdViaggio())) .toList(); OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 90); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java index 83a09e78..67dcf99e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java @@ -9,6 +9,7 @@ public class GetPickingListDTO { private Integer numero; private String gestione; private String dataConsegna; + private Integer idViaggio; public String getData() { return data; @@ -46,4 +47,12 @@ public class GetPickingListDTO { return this; } + public Integer getIdViaggio() { + return idViaggio; + } + + public GetPickingListDTO setIdViaggio(Integer idViaggio) { + this.idViaggio = idViaggio; + return this; + } } diff --git a/app/src/main/res/drawable/ic_black_truck.png b/app/src/main/res/drawable/ic_black_truck.png new file mode 100644 index 0000000000000000000000000000000000000000..91c170d08efa00e6a69e3c3c3a7c466e113479e9 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lNlITR6JcA zLn`LHook&T5-8HP|474vPK~BTonm&}oW~kEIXxFnZFM~ACT+b@@r755^Y;XY zKiz0_VanDCQzV$Dd3CRFHDz9A96nL+YStOvua}s*`lJ+kP?3+|Ge*y!oHdN|7!S`V zT^2NpbLn*cPjdDR#Rn$s;N7Meo1pQL??uxPH9&Uv;g%=|J%aek9rfO2LG3q*gs zolqWrhXtr{HzPy3?5BN9V#g$7b|orGY~ZMPJ>hrCoP$fH#hMrye#;d7Kjd>sN%8K6 z03L=N?5Q-Pv)h;h*{0@2c(5_dDY)=q9>@Q8ns+x`;K?|!=Kqb7 zIc2f|yAl^lGF<45>{-2ZvCq`)hNYIb`1u>Xr#&}$SfMxJUXt@2W`=2u^L3)uovEAn zj`80QzBwChme+n`cCBz$JAIzrBzaxMv*bCE&lyb*)UVrb`p@p{n#Fx`O@ESZS3J+* z$!ah_M!c7pik!?ZwExV1{`J78Q;$_2n5M0KnD#XNm507;%2ts;b{VEPH;LD*1ru%+ zcOUUq1_r>PhOGzwvLxSI-6OcXK5U8fv~7%gf9#Y#6TU#*?f)8J==m~N6;yLyG(9#m zyGhEx|Df)H=OV}cANl`XHHi6{<`2Iv%RKiN^F?2_EloV|kLS~yv$Gi|JJ?^~)LG}E zUcflx)QuLKmuHVOd_Qna%JP=h`H6YETH>_rwk?S|dS*j!%^S|h*IOrm#riXtMD7*!LR zvlpeE@%4W!(`ThDa%JiQh4_iv?irq$_Wn+d^fu=!KRJ?lBaTUFEr`=TuB)VGc>S!| zt&Q>5WVL|;YsCaF&+znKyXaOUKi}gV%>{Al@2omz9`bp-+dzHSu~YAvclc(wajm)D zb(;OkB)9m+uU3U;Cx6H)bpCoPQ*Ew()eojML3{H`9(>RCJ7)0xPT*d_7f0X5S#A5_ z^VNK3_qywyQxE7q5;u0*cK^H3tT^>o2H{Nph5An{3nU@}LiT3XR4w5vj=9sjGxhW< zFNT^UJ{fKX@(=5qG<_yr_@V{RsX#{KC;r1`4>TN?e%c8vK^Qz;{an^LB{Ts5YmWX5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/vendita_main_list_group_model.xml b/app/src/main/res/layout/vendita_main_list_group_model.xml index 20fc1109..9f670cb3 100644 --- a/app/src/main/res/layout/vendita_main_list_group_model.xml +++ b/app/src/main/res/layout/vendita_main_list_group_model.xml @@ -1,12 +1,14 @@ - + + + + - - + @@ -22,12 +24,12 @@ android:id="@+id/vendita_main_list_group_item_container_root" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="2dp" - android:paddingEnd="8dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" android:layout_toEndOf="@id/empty_view" - android:background="@color/full_white"> + android:background="@color/full_white" + android:paddingStart="2dp" + android:paddingTop="8dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp"> - + android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox" + android:orientation="vertical"> - + - + + + + + - + tools:text="Destinatario - Indirizzo" /> - + + + + + + + + + + + android:layout_alignBottom="@id/vendita_main_list_group_item_container_root" + android:layout_marginTop="2dp" + android:layout_marginBottom="2dp" /> diff --git a/ext_sources/ICONS/icons8-camion-96.png b/ext_sources/ICONS/icons8-camion-96.png new file mode 100644 index 0000000000000000000000000000000000000000..91c170d08efa00e6a69e3c3c3a7c466e113479e9 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lNlITR6JcA zLn`LHook&T5-8HP|474vPK~BTonm&}oW~kEIXxFnZFM~ACT+b@@r755^Y;XY zKiz0_VanDCQzV$Dd3CRFHDz9A96nL+YStOvua}s*`lJ+kP?3+|Ge*y!oHdN|7!S`V zT^2NpbLn*cPjdDR#Rn$s;N7Meo1pQL??uxPH9&Uv;g%=|J%aek9rfO2LG3q*gs zolqWrhXtr{HzPy3?5BN9V#g$7b|orGY~ZMPJ>hrCoP$fH#hMrye#;d7Kjd>sN%8K6 z03L=N?5Q-Pv)h;h*{0@2c(5_dDY)=q9>@Q8ns+x`;K?|!=Kqb7 zIc2f|yAl^lGF<45>{-2ZvCq`)hNYIb`1u>Xr#&}$SfMxJUXt@2W`=2u^L3)uovEAn zj`80QzBwChme+n`cCBz$JAIzrBzaxMv*bCE&lyb*)UVrb`p@p{n#Fx`O@ESZS3J+* z$!ah_M!c7pik!?ZwExV1{`J78Q;$_2n5M0KnD#XNm507;%2ts;b{VEPH;LD*1ru%+ zcOUUq1_r>PhOGzwvLxSI-6OcXK5U8fv~7%gf9#Y#6TU#*?f)8J==m~N6;yLyG(9#m zyGhEx|Df)H=OV}cANl`XHHi6{<`2Iv%RKiN^F?2_EloV|kLS~yv$Gi|JJ?^~)LG}E zUcflx)QuLKmuHVOd_Qna%JP=h`H6YETH>_rwk?S|dS*j!%^S|h*IOrm#riXtMD7*!LR zvlpeE@%4W!(`ThDa%JiQh4_iv?irq$_Wn+d^fu=!KRJ?lBaTUFEr`=TuB)VGc>S!| zt&Q>5WVL|;YsCaF&+znKyXaOUKi}gV%>{Al@2omz9`bp-+dzHSu~YAvclc(wajm)D zb(;OkB)9m+uU3U;Cx6H)bpCoPQ*Ew()eojML3{H`9(>RCJ7)0xPT*d_7f0X5S#A5_ z^VNK3_qywyQxE7q5;u0*cK^H3tT^>o2H{Nph5An{3nU@}LiT3XR4w5vj=9sjGxhW< zFNT^UJ{fKX@(=5qG<_yr_@V{RsX#{KC;r1`4>TN?e%c8vK^Qz;{an^LB{Ts5YmWX5 literal 0 HcmV?d00001 From e7621e6eaabeade1b181750ef8764477d4eda86c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 11 Mar 2020 09:31:54 +0100 Subject: [PATCH 2/3] Risolto problema di crash in spedizione --- .../viewmodel/VenditaOrdineInevasoViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index c50d4c26..cbb33237 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -1194,7 +1194,7 @@ 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)) { - dto.setNumCnf(dto.getQtaDaEvadere().divide(dto.getQtaCnf()).intValue()); + 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); From 1ed7b2762956db27209f8a280eb23713c3481b59 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 11 Mar 2020 09:32:41 +0100 Subject: [PATCH 3/3] -> 1.12.5 (134) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bdba4f18..407b1238 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 133 - def appVersionName = '1.12.4' + def appVersionCode = 134 + def appVersionName = '1.12.5' signingConfigs { release {