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

[FIX] Aggiunta gestione nelle query di UltimeConsegneCliente

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-10-07 16:17:36 +02:00
parent 5c2ca531e5
commit b98b22edd1
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
View File

@ -172,6 +172,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC
List<String> foundGestioni = Stream.of(this.mDocumentiResiList) List<String> foundGestioni = Stream.of(this.mDocumentiResiList)
.map(DocumentoResoDTO::getGestione) .map(DocumentoResoDTO::getGestione)
.distinct() .distinct()
.withoutNulls()
.toList(); .toList();
if(foundGestioni.size() > 1) { if(foundGestioni.size() > 1) {

11
app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/dto/WithdrawableDtbDocr.java
View File

@ -8,6 +8,8 @@ import it.integry.integrywmsnative.core.model.MtbColr;
public class WithdrawableDtbDocr extends DtbDocr { public class WithdrawableDtbDocr extends DtbDocr {
private String gestione;
private List<MtbColr> withdrawRows = new ArrayList<>(); private List<MtbColr> withdrawRows = new ArrayList<>();
public WithdrawableDtbDocr() { public WithdrawableDtbDocr() {
@ -22,4 +24,13 @@ public class WithdrawableDtbDocr extends DtbDocr {
this.withdrawRows = withdrawRows; this.withdrawRows = withdrawRows;
return this; return this;
} }
public String getGestione() {
return gestione;
}
public WithdrawableDtbDocr setGestione(String gestione) {
this.gestione = gestione;
return this;
}
} }

8
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java
View File

@ -26,13 +26,15 @@ public class UltimeConsegneClienteRESTConsumer {
int numberOfDayToAnalyze = 90; int numberOfDayToAnalyze = 90;
String sql = "SELECT consegne.*, " + String sql = "SELECT consegne.*, " +
" rag_soc " + " rag_soc," +
" dtb_doct.gestione " +
"FROM WMS_GetUltimeConsegneClienti(" + "FROM WMS_GetUltimeConsegneClienti(" +
UtilityDB.valueToString(numberOfConsegnePerCli) + ", " + UtilityDB.valueToString(numberOfConsegnePerCli) + ", " +
UtilityDB.valueToString(codAnag) + ", " + UtilityDB.valueToString(codAnag) + ", " +
UtilityDB.valueToString(codMart) + ", " + UtilityDB.valueToString(codMart) + ", " +
UtilityDB.valueToString(codMdep) + ", " + UtilityDB.valueToString(codMdep) + ", " +
UtilityDB.valueToString(numberOfDayToAnalyze) + ") consegne " + UtilityDB.valueToString(numberOfDayToAnalyze) + ") consegne " +
"INNER JOIN dtb_doct ON consegne.num_doc = dtb_doct.num_doc AND consegne.data_doc = dtb_doct.data_doc AND consegne.cod_anag = dtb_doct.cod_anag AND consegne.cod_dtip = dtb_doct.cod_dtip AND consegne.ser_doc = dtb_doct.ser_doc " +
"LEFT OUTER JOIN gtb_anag ON consegne.cod_anag = gtb_anag.cod_anag " + "LEFT OUTER JOIN gtb_anag ON consegne.cod_anag = gtb_anag.cod_anag " +
"ORDER BY rag_soc, " + "ORDER BY rag_soc, " +
" counter_consegna "; " counter_consegna ";
@ -58,7 +60,7 @@ public class UltimeConsegneClienteRESTConsumer {
StringBuilder sbWhereCond = new StringBuilder(); StringBuilder sbWhereCond = new StringBuilder();
for(int i = 0; i < consegne.size(); i++) { for(int i = 0; i < consegne.size(); i++) {
sbWhereCond.append(String.format("(data_doc = '%s' AND num_doc = %d AND ser_doc = '%s' AND cod_anag = '%s' AND cod_dtip = '%s')", sbWhereCond.append(String.format("(dtb_docr.data_doc = '%s' AND dtb_docr.num_doc = %d AND dtb_docr.ser_doc = '%s' AND dtb_docr.cod_anag = '%s' AND dtb_docr.cod_dtip = '%s')",
UtilityDate.formatDate(consegne.get(i).getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH), UtilityDate.formatDate(consegne.get(i).getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH),
consegne.get(i).getNumDoc(), consegne.get(i).getNumDoc(),
consegne.get(i).getSerDoc(), consegne.get(i).getSerDoc(),
@ -133,7 +135,9 @@ public class UltimeConsegneClienteRESTConsumer {
" ,dtb_docr.[cod_alis]" + " ,dtb_docr.[cod_alis]" +
" ,dtb_docr.[data_ins_row]" + " ,dtb_docr.[data_ins_row]" +
" ,dtb_docr.[note] " + " ,dtb_docr.[note] " +
" ,dtb_doct.[gestione] " +
"FROM dtb_docr " + "FROM dtb_docr " +
"INNER JOIN dtb_doct ON dtb_docr.num_doc = dtb_doct.num_doc AND dtb_docr.data_doc = dtb_doct.data_doc AND dtb_docr.cod_anag = dtb_doct.cod_anag AND dtb_docr.cod_dtip = dtb_doct.cod_dtip AND dtb_docr.ser_doc = dtb_doct.ser_doc " +
"INNER JOIN mtb_aart ON dtb_docr.cod_mart = mtb_aart.cod_mart " + "INNER JOIN mtb_aart ON dtb_docr.cod_mart = mtb_aart.cod_mart " +
"LEFT OUTER JOIN ctb_cont ON mtb_aart.cod_ccon_ricavi = ctb_cont.cod_ccon " + "LEFT OUTER JOIN ctb_cont ON mtb_aart.cod_ccon_ricavi = ctb_cont.cod_ccon " +
"LEFT OUTER JOIN ctb_grup ON ctb_cont.cod_cgrp = ctb_grup.cod_cgrp " + "LEFT OUTER JOIN ctb_grup ON ctb_cont.cod_cgrp = ctb_grup.cod_cgrp " +