Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-02-22 16:07:27 +01:00
parent cc6f8dfa52 2d6f27d8a6
commit 02ac9d1559
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-engine/src/main/java/it/integry/ems/product/service/ContrattiDiVenditaService.java
View File

@@ -43,7 +43,7 @@ public class ContrattiDiVenditaService {
"WITH ord AS\n" +
" (SELECT dtb_ordr.id_contratto,\n" +
" dtb_ordr.cod_mart,\n" +
" SUM((dtb_ordr.qta_ord - dtb_ordr.qta_evasa) / dtb_ordr.rap_conv) AS qta_ord\n" +
" SUM((dtb_ordr.qta_ord - dtb_ordr.qta_evasa) * dtb_ordr.rap_conv) AS qta_ord\n" +
" FROM dtb_ordt\n" +
" INNER JOIN dtb_ordr ON dtb_ordt.gestione = dtb_ordr.gestione AND\n" +
" dtb_ordt.data_ord = dtb_ordr.data_ord AND\n" +
@@ -57,7 +57,7 @@ public class ContrattiDiVenditaService {
" dtb_ordr.cod_mart)\n" +
" , doc AS (SELECT dtb_docr.id_contratto,\n" +
" dtb_docr.cod_mart,\n" +
" SUM(dtb_docr.qta_doc / dtb_docr.rap_conv) AS qta_doc\n" +
" SUM(dtb_docr.qta_doc * dtb_docr.rap_conv) AS qta_doc\n" +
" FROM dtb_doct\n" +
" INNER JOIN dtb_docr ON dtb_doct.cod_anag = dtb_docr.cod_anag AND\n" +
" dtb_doct.cod_dtip = dtb_docr.cod_dtip AND\n" +