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

Finish v1.16.15(197)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-03-08 16:46:28 +01:00
commit 81bc85f854
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 196 def appVersionCode = 197
def appVersionName = '1.16.14' def appVersionName = '1.16.15'
signingConfigs { signingConfigs {
release { release {

4
app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
View File

@ -145,7 +145,7 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
"FROM ord_without_positioned_mtb_colt " + "FROM ord_without_positioned_mtb_colt " +
"CROSS APPLY input_values " + "CROSS APPLY input_values " +
"GROUP BY cod_mart, unt_mis, input_values.data_inizio, input_values.data_fine " + "GROUP BY cod_mart, unt_mis, input_values.data_inizio, input_values.data_fine " +
"HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 " + "HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 AND SUM(num_cnf_ord_calc - num_cnf_gia_posizionata) > 0 " +
"ORDER BY cod_mart"; "ORDER BY cod_mart";
@ -392,7 +392,7 @@ ORDER BY cod_mart, posizione
"CROSS APPLY input_values " + "CROSS APPLY input_values " +
"WHERE cod_mart = " + UtilityDB.valueToString(codMart) + " " + "WHERE cod_mart = " + UtilityDB.valueToString(codMart) + " " +
"GROUP BY cod_mart, unt_mis, cod_jfas, input_values.data_inizio, input_values.data_fine " + "GROUP BY cod_mart, unt_mis, cod_jfas, input_values.data_inizio, input_values.data_fine " +
"HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 " + "HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 AND SUM(num_cnf_ord_calc - num_cnf_gia_posizionata) > 0 " +
"ORDER BY cod_mart"; "ORDER BY cod_mart";

20
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@ -437,6 +437,9 @@ public class SpedizioneViewModel {
this.sendError(new InvalidLUException()); this.sendError(new InvalidLUException());
onComplete.run(); onComplete.run();
} else { } else {
//Reset of existant mtbColrs
mtbColt.setMtbColr(new ObservableArrayList<>());
this.mCurrentMtbColt = mtbColt; this.mCurrentMtbColt = mtbColt;
mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini); mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini);
this.mIsNewLU = false; this.mIsNewLU = false;
@ -1446,12 +1449,17 @@ public class SpedizioneViewModel {
mtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP); mtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
MtbColr mtbColr = (MtbColr) mtbColrToDelete.clone(); MtbColr mtbColr = (MtbColr) mtbColrToDelete.clone();
mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT);
mtbColr.setQtaCol(mtbColr.getQtaCol().multiply(new BigDecimal(-1))) if(mCurrentMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) {
.setNumCnf(mtbColr.getNumCnf().multiply(new BigDecimal(-1))) mtbColr.setOperation(CommonModelConsts.OPERATION.DELETE);
.setRiga(null) } else {
.setPesoLordoKg(null) mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT);
.setPesoNettoKg(null); mtbColr.setQtaCol(mtbColr.getQtaCol().multiply(new BigDecimal(-1)))
.setNumCnf(mtbColr.getNumCnf().multiply(new BigDecimal(-1)))
.setRiga(null)
.setPesoLordoKg(null)
.setPesoNettoKg(null);
}
mtbColt.getMtbColr().add(mtbColr); mtbColt.getMtbColr().add(mtbColr);