Compare commits

...

2 Commits

Author SHA1 Message Date
Luis Eduardo Estevao
3aa967352f Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m17s
2026-02-18 13:31:09 -03:00
Luis Eduardo Estevao
175a1b9ccd feat: add ShippingService with methods for retrieving customer shippings, shop collections, customer collections, and delivery schedules. 2026-02-18 13:31:03 -03:00

View File

@@ -169,13 +169,13 @@ export class ShippingService {
const sql = `SELECT PCDIASUTEIS.DATA as "dateDelivery", const sql = `SELECT PCDIASUTEIS.DATA as "dateDelivery",
NVL (PCDIASUTEIS.DIAROTA, 'N') as "delivery", NVL (PCDIASUTEIS.DIAROTA, 'N') as "delivery",
CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0 CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0
ELSE (PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', 12)) END as "deliverySize", ELSE (PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', 1)) END as "deliverySize",
ROUND ( (NVL (VENDAS.TOTPESO, 0) / 1000), 3) as "saleWeigth", ROUND ( (NVL (VENDAS.TOTPESO, 0) / 1000), 3) as "saleWeigth",
CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0 CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0
ELSE ROUND ( ELSE ROUND (
GREATEST ( GREATEST (
( ( PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', ( ( PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA',
12) 1)
* 1000) * 1000)
- NVL (VENDAS.TOTPESO, 0)) - NVL (VENDAS.TOTPESO, 0))
/ 1000, / 1000,
@@ -186,7 +186,9 @@ export class ShippingService {
FROM PCPEDC FROM PCPEDC
WHERE PCPEDC.POSICAO IN ('L', 'M') WHERE PCPEDC.POSICAO IN ('L', 'M')
AND PCPEDC.CONDVENDA = 8 AND PCPEDC.CONDVENDA = 8
AND PCPEDC.CODFILIAL IN (12, 13, 4, 6) AND EXISTS(SELECT 1 FROM PCPEDI
WHERE PCPEDI.NUMPED = PCPEDC.NUMPED
AND PCPEDI.CODFILIALRETIRA IN (1) )
AND EXISTS AND EXISTS
(SELECT TV7.NUMPED (SELECT TV7.NUMPED
FROM PCPEDC TV7 FROM PCPEDC TV7
@@ -194,15 +196,15 @@ export class ShippingService {
AND TV7.POSICAO = 'F') AND TV7.POSICAO = 'F')
AND PCPEDC.DTENTREGA >= TRUNC (SYSDATE) + 3 AND PCPEDC.DTENTREGA >= TRUNC (SYSDATE) + 3
GROUP BY PCPEDC.DTENTREGA) VENDAS GROUP BY PCPEDC.DTENTREGA) VENDAS
WHERE PCDIASUTEIS.CODFILIAL = 12 AND PCDIASUTEIS.DATA BETWEEN TRUNC (SYSDATE) + 3 AND TRUNC(SYSDATE) + 20 --AND NVL(PCDIASUTEIS.DIAROTA,'N') = 'S' WHERE PCDIASUTEIS.CODFILIAL = 1 AND PCDIASUTEIS.DATA BETWEEN TRUNC (SYSDATE) + 3 AND TRUNC(SYSDATE) + 20 --AND NVL(PCDIASUTEIS.DIAROTA,'N') = 'S'
AND PCDIASUTEIS.DATA = VENDAS.DTENTREGA(+) AND PCDIASUTEIS.DATA = VENDAS.DTENTREGA(+)
ORDER BY PCDIASUTEIS.DATA `; ORDER BY PCDIASUTEIS.DATA `;
const data = await queryRunner.query(sql); const data = await queryRunner.query(sql);
const sqlDeliveryDate = `SELECT TRUNC(SYSDATE) + esf_calcular_prazo_entrega_programada(TRUNC(SYSDATE), const sqlDeliveryDate = `SELECT TRUNC(SYSDATE) + esf_calcular_prazo_entrega_programada(TRUNC(SYSDATE),
'12', '1',
129, '', 0, 500) as "date" 169, '', 0, 500) as "date"
FROM DUAL`; FROM DUAL`;
const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate); const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate);