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

Finish v1_11_9(128)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-01-28 11:08:07 +01:00
commit 9c1216443b
5 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 127 def appVersionCode = 128
def appVersionName = '1.11.8' def appVersionName = '1.11.9'
signingConfigs { signingConfigs {
release { release {

47
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
View File

@ -606,23 +606,50 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
} }
public static void doesColloContainsAnyRow(MtbColt mtbColt, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) { public static void canLUBeDeleted(MtbColt mtbColt, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
params.put("gestione", mtbColt.getGestione()); params.put("mtb_colt.gestione", mtbColt.getGestione());
params.put("ser_collo", mtbColt.getSerCollo()); params.put("mtb_colt.ser_collo", mtbColt.getSerCollo());
params.put("num_collo", mtbColt.getNumCollo()); params.put("mtb_colt.num_collo", mtbColt.getNumCollo());
params.put("data_collo", mtbColt.getDataColloD()); params.put("mtb_colt.data_collo", mtbColt.getDataColloD());
String whereCond = UtilityQuery.concatFieldsInWhereCond(params); String whereCond = UtilityQuery.concatFieldsInWhereCond(params);
String query = "SELECT COUNT(*) as value FROM mtb_colr " +
"WHERE " + whereCond;
Type typeOfObjectsList = new TypeToken<ArrayList<SingleValueDTO<Integer>>>() { String query = "SELECT mtb_colt.* " +
"FROM mtb_colt " +
"LEFT OUTER JOIN " +
" (SELECT gestione, " +
" data_collo, " +
" num_collo, " +
" ser_collo, " +
" cod_mart, " +
" cod_col, " +
" cod_tagl, " +
" partita_mag, " +
" SUM(qta_col) sum_qta_col " +
" FROM mtb_colr " +
" GROUP BY gestione, " +
" data_collo, " +
" num_collo, " +
" ser_collo, " +
" cod_mart, " +
" cod_col, " +
" cod_tagl, " +
" partita_mag) sum_mtb_colr ON mtb_colt.gestione = sum_mtb_colr.gestione " +
"AND mtb_colt.num_collo = sum_mtb_colr.num_collo " +
"AND mtb_colt.data_collo = sum_mtb_colr.data_collo " +
"AND mtb_colt.ser_collo = sum_mtb_colr.ser_collo " +
"AND sum_mtb_colr.sum_qta_col > 0 " +
"WHERE sum_mtb_colr.num_collo IS NULL " +
" AND " + whereCond;
Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
}.getType(); }.getType();
SystemRESTConsumer.<ArrayList<SingleValueDTO<Integer>>>processSql(query, typeOfObjectsList, data -> { SystemRESTConsumer.<ArrayList<MtbColt>>processSql(query, typeOfObjectsList, data -> {
onComplete.run(data.get(0).getValue() > 0); onComplete.run(data != null && data.size() > 0);
}, onFailed); }, onFailed);
} }

2
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
View File

@ -115,7 +115,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
public void onFailure(Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> call, final Throwable t) { public void onFailure(Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> call, final Throwable t) {
Log.e("CodMdepsAvailable", t.toString()); Log.e("CodMdepsAvailable", t.toString());
callback.onFailed(new Exception(t)); callback.onFailed(new Exception(t));
UtilityLogger.errorMe(new Exception(t)); // UtilityLogger.errorMe(new Exception(t));
} }
}); });
} }

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java
View File

@ -74,7 +74,7 @@ public class ProdRecuperoMaterialeHelper {
"LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " + "LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " +
"WHERE jtb_fasi.cod_jfas IS NOT NULL " + "WHERE jtb_fasi.cod_jfas IS NOT NULL " +
" AND segno = -1 " + " AND segno = -1 " +
" AND mtb_colr.data_collo > DATEADD(DAY, -1, GETDATE()) " + " AND mtb_colr.data_collo > DATEADD(DAY, -5, GETDATE()) " +
"GROUP BY jtb_fasi.cod_jfas, " + "GROUP BY jtb_fasi.cod_jfas, " +
" jtb_fasi.descrizione, " + " jtb_fasi.descrizione, " +
" mtb_colr.gestione, " + " mtb_colr.gestione, " +

5
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@ -13,7 +13,6 @@ import com.tfb.fbtoast.FBToast;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -866,9 +865,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
final MtbColt currentMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get(); final MtbColt currentMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get();
ColliMagazzinoRESTConsumer.doesColloContainsAnyRow(currentMtbColt, containRows -> { ColliMagazzinoRESTConsumer.canLUBeDeleted(currentMtbColt, canBeDeleted -> {
if(containRows) { if(!canBeDeleted) {
Runnable saveAction = () -> { Runnable saveAction = () -> {
ColliMagazzinoRESTConsumer.updateDataFine( ColliMagazzinoRESTConsumer.updateDataFine(
mActivity, mActivity,