chore: update image tag to f1c0543 [skip ci]

.gitea/workflows/deploy-api.yaml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Build and Push
         run: |
-          REGISTRY="git.simplifiquehc.com.br"
+          REGISTRY="172.35.0.216:3000"
           IMAGE_NAME="$REGISTRY/simplifique/vendaweb-api"
           SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
 
@@ -27,7 +27,7 @@ jobs:
       - name: Update Manifest and Push to Git
         run: |
           SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
-          IMAGE_NAME="git.simplifiquehc.com.br/simplifique/vendaweb-api"
+          IMAGE_NAME="172.35.0.216:3000/simplifique/vendaweb-api"
 
           MANIFEST_FILE="k8s/overlays/prod/deployment-image-digest-patch.yaml"
 

k8s/argocd/application-prod.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://git.simplifiquehc.com.br/simplifique/Vendaweb-api.git
+    repoURL: http://172.35.0.216:3000/simplifique/Vendaweb-api.git
     targetRevision: main
     path: k8s/overlays/prod
   destination:

k8s/base/deployment.yaml

@@ -27,7 +27,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
         - name: api
-          image: git.simplifiquehc.com.br/simplifique/vendaweb-api:589fa29
+          image: 172.35.0.216:3000/simplifique/vendaweb-api:589fa29
           imagePullPolicy: IfNotPresent
           ports:
             - name: http

k8s/overlays/prod/deployment-image-digest-patch.yaml

@@ -7,4 +7,4 @@ spec:
     spec:
       containers:
         - name: api
-          image: git.simplifiquehc.com.br/simplifique/vendaweb-api:f0ef3dd
+          image: 172.35.0.216:3000/simplifique/vendaweb-api:f1c0543

k8s/overlays/prod/deployment-prod-patch.yaml

@@ -3,4 +3,4 @@ kind: Deployment
 metadata:
   name: vendaweb-api
 spec:
-  replicas: 15
+  replicas: 2

k8s/overlays/prod/hpa.yaml

@@ -0,0 +1,18 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: vendaweb-api
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: vendaweb-api
+  minReplicas: 2
+  maxReplicas: 15
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 70

k8s/overlays/prod/kustomization.yaml

@@ -5,6 +5,7 @@ namespace: vendaweb-prod
 
 resources:
   - ../../base
+  - hpa.yaml
 
 patches:
   - path: service-patch.yaml

src/app.controller.ts

@@ -14,7 +14,7 @@ export class AppController {
   @Get('health')
   @ApiOperation({ summary: 'Health check' })
   healthCheck() {
-    return { status: 'SIMPLIFIQUE HOME CENTER 2026' };
+    return { status: 'NOVA VERSAO 2026' };
   }
 
 }

src/backoffice/lists/lists.controller.ts

@@ -28,7 +28,7 @@ export class ListsController {
      * Consulta tabela de checkouts da filial informada
      */
     @Get('checkout/:store')
-    @ApiParam({name: 'Código da filial',})
+    @ApiParam({ name: 'Código da filial', })
     async getCheckout(@Param('store') idStore: string) {
         return this.listsServices.GetCheckout(idStore);
     }
@@ -44,9 +44,9 @@ export class ListsController {
     /**
     * Consulta tabela de plano de pagamento para pedido de venda
     */
-    @Get('paymentplan/:billindid')
-        async getPaymentPlan(@Param('billindid') billingId: string) {
-        return this.listsServices.GetPaymentPlan(billingId);
+    @Get('paymentplan/:billindid/:customerId')
+    async getPaymentPlan(@Param('billindid') billingId: string, @Param('customerId') customerId: string) {
+        return this.listsServices.GetPaymentPlan(billingId, customerId);
     }
 
     /**

src/backoffice/lists/lists.service.ts

@@ -66,7 +66,7 @@ export class ListsService {
             const checkouts = await queryRunner.manager
                 .getRepository(Checkout)
                 .createQueryBuilder('pccaixa')
-                .where("\"pccaixa\".CODFILIAL = :idStore", {idStore: idStore})
+                .where("\"pccaixa\".CODFILIAL = :idStore", { idStore: idStore })
                 .orderBy("\"pccaixa\".NUMCAIXA")
                 .getMany();
             return checkouts;
@@ -89,7 +89,7 @@ export class ListsService {
                 .getRepository(Pcempr)
                 .createQueryBuilder('pcempr')
                 .select("\"pcempr\".matricula as \"id\", \"pcempr\".nome as \"name\", \"pcempr\".email as \"email\", \"pcempr\".usuariobd as \"smallName\"")
-                .where("\"pcempr\".CODFILIAL = :idStore", {idStore: idStore})
+                .where("\"pcempr\".CODFILIAL = :idStore", { idStore: idStore })
                 .orderBy("\"pcempr\".NOME")
                 .getRawMany();
             return checkouts;
@@ -102,20 +102,24 @@ export class ListsService {
         }
     }
 
-    async GetPaymentPlan(billingId: string){
+    async GetPaymentPlan(billingId: string, clientId: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = '  SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",  ' +
-                        '         NVL(PCPLPAG.NUMDIAS,0) as "numdias" ' +
-                        '    FROM PCPLPAG  ' +     
-                        '    WHERE EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG ' +
-                        '                  WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG ' + 
-                        '                   AND PCCOBPLPAG.CODCOB = :CODCOB ) '
-                        '  ORDER BY PCPAG.DESCRICAO ';
-            const paymentPlans = await queryRunner.query(sql, [billingId]);
+            const sql = `SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",  
+                                NVL(PCPLPAG.NUMDIAS,0) as "numdias" 
+                           FROM PCPLPAG, PCCLIENT, PCPLPAG PLANO_CLI   
+                          WHERE PCCLIENT.CODCLI = :CODCLI
+                            AND PCCLIENT.CODPLPAG = PLANO_CLI.CODPLPAG (+)
+                            AND PCPLPAG.NUMDIAS <= NVL(PLANO_CLI.NUMDIAS,9999) 
+                            AND EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG 
+                                                    WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG 
+                                                                AND PCCOBPLPAG.CODCOB = :CODCOB ) 
+                          ORDER BY PCPLPAG.DESCRICAO`;
+
+            const paymentPlans = await queryRunner.query(sql, [clientId, billingId]);
             return paymentPlans;
         } catch (error) {
             throw error;
@@ -125,7 +129,7 @@ export class ListsService {
         }
     }
 
-    async GetBilling(clienteId: number){
+    async GetBilling(clienteId: number) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -135,7 +139,7 @@ export class ListsService {
                 '   FROM PCCOB ' +
                 '  WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\'  ' +
                 '               AND ( ( NOT EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI  ) AND  ' +
-                        '                   ( PCCOB.NIVELVENDA <= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' +
+                '                   ( PCCOB.NIVELVENDA >= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' +
                 '                                            WHERE PCCLIENT.CODCLI = :CODCLI AND PCCLIENT.CODCOB = C.CODCOB ) ) ) OR ' +
                 '                      EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' +
                 ' ORDER BY PCCOB.CODCOB';
@@ -149,7 +153,7 @@ export class ListsService {
         }
     }
 
-    async GetPartners(){
+    async GetPartners() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -170,13 +174,13 @@ export class ListsService {
         }
     }
 
-    async GetPreCustomer(idCart: string){
+    async GetPreCustomer(idCart: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = '  select CPF as "document"     '+
+            const sql = '  select CPF as "document"     ' +
                 '        ,NOME as "name"        ' +
                 '        ,TELEFONE as "phone"   ' +
                 '        ,IDCART as "idCart"    ' +
@@ -195,7 +199,7 @@ export class ListsService {
         }
     }
 
-    async GetPlaces(){
+    async GetPlaces() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -216,7 +220,7 @@ export class ListsService {
         }
     }
 
-    async GetStorePlaces(){
+    async GetStorePlaces() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -237,7 +241,7 @@ export class ListsService {
         }
     }
 
-    async GetRamo(){
+    async GetRamo() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -259,7 +263,7 @@ export class ListsService {
         }
     }
 
-    async GetStates(state: string){
+    async GetStates(state: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -278,7 +282,7 @@ export class ListsService {
         }
     }
 
-    async getSupervisores(){
+    async getSupervisores() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -299,4 +303,4 @@ export class ListsService {
         }
     }
 
- }
+}

src/delivery/services/shipping.service.ts

@@ -129,19 +129,19 @@ export class ShippingService {
         .createQueryBuilder('ESVRETIRALOJASCLIENTE')
         .select([
           'codfilial        as "codigoFilial"'
-                ,'numped          as "numeroPedido"'
-                ,'numnota         as "numeroNota"'
-                ,'dtfat           as "dataFaturamento"'
-                ,'datapedido      as "dataPedido"'
-                ,'codcli          as "codigoCliente"'
-                ,'cliente         as "nomeCliente"'
-                ,'codfilialretira as "codigoLoja"'
-                ,'razaosocial     as "nomeLoja"'
-                ,'qtitens         as "quantidadeItens"'
-                ,'quantidade      as "quantidade"'
+          , 'numped          as "numeroPedido"'
+          , 'numnota         as "numeroNota"'
+          , 'dtfat           as "dataFaturamento"'
+          , 'datapedido      as "dataPedido"'
+          , 'codcli          as "codigoCliente"'
+          , 'cliente         as "nomeCliente"'
+          , 'codfilialretira as "codigoLoja"'
+          , 'razaosocial     as "nomeLoja"'
+          , 'qtitens         as "quantidadeItens"'
+          , 'quantidade      as "quantidade"'
         ])
         .where("email = 'eduardoestevao.gyn@gmail.com'")
-        .andWhere("codfilial = :codfilial", {codfilial: id})
+        .andWhere("codfilial = :codfilial", { codfilial: id })
         .getRawMany();
 
       return deliveries;
@@ -169,13 +169,13 @@ export class ShippingService {
       const sql = `SELECT PCDIASUTEIS.DATA               as "dateDelivery",
                           NVL (PCDIASUTEIS.DIAROTA, 'N') as "delivery",
                           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",
                           CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0 
                             ELSE ROUND (
                               GREATEST (
                                     (  (  PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA',
-                                                                        12)
+                                                                        1)
                                         * 1000)
                                       - NVL (VENDAS.TOTPESO, 0))
                                   / 1000,
@@ -186,7 +186,9 @@ export class ShippingService {
                               FROM PCPEDC
                             WHERE     PCPEDC.POSICAO IN ('L', 'M')
                                   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
                                           (SELECT TV7.NUMPED
                                               FROM PCPEDC TV7
@@ -194,15 +196,15 @@ export class ShippingService {
                                                   AND TV7.POSICAO = 'F')
                                   AND PCPEDC.DTENTREGA >= TRUNC (SYSDATE) + 3
                           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(+)
                 ORDER BY PCDIASUTEIS.DATA `;
 
       const data = await queryRunner.query(sql);
 
       const sqlDeliveryDate = `SELECT TRUNC(SYSDATE) + esf_calcular_prazo_entrega_programada(TRUNC(SYSDATE), 
-                                              '12', 
-                                            129, '', 0, 500) as "date"
+                                              '1', 
+                                            169, '', 0, 500) as "date"
                                   FROM DUAL`;
       const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate);
 

src/sales/customer/customer.service.ts

@@ -469,9 +469,9 @@ export class CustomerService {
     async InitializeCustomer() {
         const cliente = new Pcclient();
         cliente.codusur1 = 1;
-        cliente.codplpag = 10;
-        cliente.codpraca = 119;
-        cliente.codcob = "D";
+        cliente.codplpag = 18;
+        cliente.codpraca = 169;
+        cliente.codcob = "CAR";
         cliente.dtcadastro = new Date();
         cliente.codcontab = "1";
         cliente.aceitavendafracao = "N";
@@ -502,7 +502,7 @@ export class CustomerService {
         cliente.tv10usacustoproduto = "N";
         cliente.inscestadual = "ISENTO";
         cliente.codpais = 1058; //Brasil 
-        cliente.observacao = "Importado do E-Commerce";
+        cliente.observacao = "Cadastrado Venda Web";
         cliente.aceitachterceiros = "S";
         cliente.agregarvalorstdescfin = "N";
         cliente.anvisa = "N";
@@ -523,6 +523,7 @@ export class CustomerService {
         cliente.fretedespacho = "0";
         cliente.aceitavendafracao = "S";
         cliente.validarmultiplovenda = "S";
+        cliente.isentotxentrega = "S";
 
         return cliente;
     }

src/sales/order/order.service.ts

@@ -954,7 +954,7 @@ export class OrderService {
             const partners = await this.listsService.GetPartners();
             const address = await this.addressCustomerService.getAddress(order[0].customerId, order[0].addressId);
             const billing = billinds.find(data => data.codcob === order[0].billindId);
-            const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob);
+            const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob, order[0].customerId);
             const paymentPlan = paymentPlans.find(data => data.codplpag === order[0].paymentPlanId);
             const partner = partners.find(data => data.id === order[0].partnerId);
 

src/sales/pre-order/pre-order.service.ts

@@ -137,52 +137,52 @@ export class PreOrderService {
                 numeroSeq = numeroSeq + 1;
             }
 
-            if (cart.shippingValue > 0) {
-                const itemPreOrder = new Pcorcavendai();
-                itemPreOrder.numorca = preOrder.numorca;
-                itemPreOrder.data = this.formatDate(new Date());
-                itemPreOrder.codcli = cart.idCustomer;
-                itemPreOrder.codprod = 48500;
-                itemPreOrder.codauxiliar = 48500;
-                itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
-                itemPreOrder.qt = 1;
-                itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
-                itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
-                itemPreOrder.numcar = 0;
-                itemPreOrder.posicao = 'L';
-                itemPreOrder.st = 0;
-                itemPreOrder.vlcustocont = 0;
-                itemPreOrder.vlcustofin = 0;
-                itemPreOrder.vlcustoreal = 0;
-                itemPreOrder.vlcustorep = 0;
-                itemPreOrder.percom = 0;
-                itemPreOrder.perdesc = 0;
-                itemPreOrder.numseq = numeroSeq;
-                itemPreOrder.pvendabase = 0;
-                itemPreOrder.codst = await this.
-                    sharedService.
-                    getTaxId(48500,
-                        cart.saleStore,
-                        customer.estent);
-                itemPreOrder.custofinest = 0;
-                itemPreOrder.codauxiliar = 48500;
-                itemPreOrder.codfilialretira = cart.saleStore;
-                itemPreOrder.poriginal = 0;
-                itemPreOrder.pvendabase = 0;
-                itemPreOrder.pvenda1 = 0;
-                itemPreOrder.tipoentrega = 'EF';
-                console.log('Processo 3');
+            // if (cart.shippingValue > 0) {
+            //     const itemPreOrder = new Pcorcavendai();
+            //     itemPreOrder.numorca = preOrder.numorca;
+            //     itemPreOrder.data = this.formatDate(new Date());
+            //     itemPreOrder.codcli = cart.idCustomer;
+            //     itemPreOrder.codprod = 48500;
+            //     itemPreOrder.codauxiliar = 48500;
+            //     itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
+            //     itemPreOrder.qt = 1;
+            //     itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
+            //     itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
+            //     itemPreOrder.numcar = 0;
+            //     itemPreOrder.posicao = 'L';
+            //     itemPreOrder.st = 0;
+            //     itemPreOrder.vlcustocont = 0;
+            //     itemPreOrder.vlcustofin = 0;
+            //     itemPreOrder.vlcustoreal = 0;
+            //     itemPreOrder.vlcustorep = 0;
+            //     itemPreOrder.percom = 0;
+            //     itemPreOrder.perdesc = 0;
+            //     itemPreOrder.numseq = numeroSeq;
+            //     itemPreOrder.pvendabase = 0;
+            //     itemPreOrder.codst = await this.
+            //         sharedService.
+            //         getTaxId(48500,
+            //             cart.saleStore,
+            //             customer.estent);
+            //     itemPreOrder.custofinest = 0;
+            //     itemPreOrder.codauxiliar = 48500;
+            //     itemPreOrder.codfilialretira = cart.saleStore;
+            //     itemPreOrder.poriginal = 0;
+            //     itemPreOrder.pvendabase = 0;
+            //     itemPreOrder.pvenda1 = 0;
+            //     itemPreOrder.tipoentrega = 'EF';
+            //     console.log('Processo 3');
 
-                await queryRunner.manager
-                    .createQueryBuilder()
-                    .insert()
-                    .into(Pcorcavendai)
-                    .values(itemPreOrder)
-                    .execute();
-                console.log('Processo 4');
+            //     await queryRunner.manager
+            //         .createQueryBuilder()
+            //         .insert()
+            //         .into(Pcorcavendai)
+            //         .values(itemPreOrder)
+            //         .execute();
+            //     console.log('Processo 4');
 
-                numeroSeq = numeroSeq + 1;
-            }
+            //     numeroSeq = numeroSeq + 1;
+            // }
 
             //#region create PCORCAVENDAC
             console.log('Processo 5' + cart);
@@ -209,8 +209,8 @@ export class PreOrderService {
                 preOrder.codsupervisor = supervisor[0].codsupervisor;
             }
             preOrder.codemitente = cart.userId;
-            preOrder.vlfrete = cart.shippingValue;
-            preOrder.vloutrasdesp = 0;
+            preOrder.vlfrete = 0;
+            preOrder.vloutrasdesp = cart.shippingValue;
             preOrder.numitens = cart.itens.length;
             preOrder.obs1 = cart.notation1;
             preOrder.obs2 = cart.notation2;
@@ -425,7 +425,7 @@ export class PreOrderService {
             }
             // const address = await this.addressCustomerService.getAddress(preOrder[0].customerId, preOrder[0].addressId);
             const billing = billinds.find(data => data.codcob === preOrder[0].billindId);
-            const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999');
+            const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999', preOrder[0].customerId);
             const paymentPlan = paymentPlans.find(data => data.codplpag === preOrder[0].paymentPlanId);
             const partner = partners.find(data => data.id === preOrder[0].partnerId);
 

src/sales/sales/sales.service.ts

@@ -125,7 +125,7 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                     .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                     .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                    .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
+                    .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
                     .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
                     .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
                     .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -184,7 +184,7 @@ export class SalesService {
                         .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                         .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                         .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                        .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
+                        .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
                         .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
                         .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
                         .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -262,7 +262,7 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                     .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                     .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                    .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
+                    .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
                     .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
                     .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
                     .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -328,7 +328,7 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                     .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                     .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                    .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
+                    .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
                     .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
                     .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
                     .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -957,6 +957,9 @@ export class SalesService {
                                 FROM ESVESTOQUEVENDA, PCFILIAL
                             WHERE ESVESTOQUEVENDA.CODPROD = ${id}
                               AND ESVESTOQUEVENDA.CODFILIAL = PCFILIAL.CODIGO
+                              AND EXISTS(SELECT 1 FROM PCFILIALRETIRA R
+                                           WHERE R.CODFILIALVENDA = '${storeId}'
+                                             AND R.CODFILIALRETIRA = ESVESTOQUEVENDA.CODFILIAL)                              
                             ORDER BY TO_NUMBER(ESVESTOQUEVENDA.CODFILIAL) `;
 
             const stock = await queryRunner.query(sql);