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

Finish v1_0_43(46)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-04-04 13:18:10 +02:00
commit 7e76cf9a69
4 changed files with 16 additions and 10 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 = 45 def appVersionCode = 46
def appVersionName = '1.0.42' def appVersionName = '1.0.43'
signingConfigs { signingConfigs {
release { release {

6
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -528,9 +528,13 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
if (!mtbColt.get().getDisablePrint()) { if (!mtbColt.get().getDisablePrint()) {
printCollo(progress); printCollo(progress);
} else { } else {
progress.dismiss();
resetMtbColt(openNewOne); resetMtbColt(openNewOne);
} }
}, progress::dismiss, ex -> UtilityExceptions.defaultException(mContext, ex, progress)); }, () -> {
progress.dismiss();
resetMtbColt(openNewOne);
}, ex -> UtilityExceptions.defaultException(mContext, ex, progress));
} }
} else { } else {

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

@ -142,13 +142,15 @@ public class VenditaHelper {
public void getBancaliVenditaGiaRegistrati(List<OrdineVenditaGroupedInevasoDTO> orders, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) { public void getBancaliVenditaGiaRegistrati(List<OrdineVenditaGroupedInevasoDTO> orders, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
String baseSql = "SELECT DISTINCT mtb_colt.* " + String baseSql = "SELECT DISTINCT mtb_colt.* " +
"FROM mtb_colt, mtb_colr " + "FROM mtb_colt, " +
"WHERE mtb_colt.gestione = mtb_colr.gestione AND " + " mtb_colr " +
"mtb_colt.ser_collo = mtb_colr.ser_collo AND " + "WHERE mtb_colt.gestione = mtb_colr.gestione " +
"mtb_colt.data_collo = mtb_colr.data_collo AND " + " AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
"mtb_colt.num_collo = mtb_colr.num_collo AND " + " AND mtb_colt.data_collo = mtb_colr.data_collo " +
"mtb_colt.gestione IN ('V', 'L') AND " + " AND mtb_colt.num_collo = mtb_colr.num_collo " +
"mtb_colt.data_doc is null AND "; " AND (mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') " +
" AND mtb_colt.ser_collo = '/' " +
" AND mtb_colt.data_doc IS NULL AND ";
StringBuilder whereCond = new StringBuilder(); StringBuilder whereCond = new StringBuilder();