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')
+    @Get('paymentplan/:billindid/:customerId')
-        async getPaymentPlan(@Param('billindid') billingId: string) {
+    async getPaymentPlan(@Param('billindid') billingId: string, @Param('customerId') customerId: string) {
-        return this.listsServices.GetPaymentPlan(billingId);
+        return this.listsServices.GetPaymentPlan(billingId, customerId);
     }
 
     /**

src/backoffice/lists/lists.service.ts

@@ -15,18 +15,18 @@ export class ListsService {
         await queryRunner.connect();
         try {
             const sql = `SELECT PCFILIAL.CODIGO as "id", ` +
-                        `       PCFILIAL.RAZAOSOCIAL as "name",  ` + 
+                `       PCFILIAL.RAZAOSOCIAL as "name",  ` +
-                        `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
+                `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
-                        `  FROM PCFILIAL  ` +
+                `  FROM PCFILIAL  ` +
-                        ` WHERE PCFILIAL.CODIGO <> '99'  ` +
+                ` WHERE PCFILIAL.CODIGO <> '99'  ` +
-                        ` ORDER BY PCFILIAL.CODIGO `;
+                ` ORDER BY PCFILIAL.CODIGO `;
             const stores = await queryRunner.query(sql);
             return stores as Store[];
         } catch (error) {
             console.log(error);
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
@@ -37,22 +37,22 @@ export class ListsService {
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         const sql = `SELECT PCFILIAL.CODIGO as "id", ` +
-        `       PCFILIAL.RAZAOSOCIAL as "name",  ` + 
+            `       PCFILIAL.RAZAOSOCIAL as "name",  ` +
-        `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
+            `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
-        `  FROM PCFILIAL  `;
+            `  FROM PCFILIAL  `;
         const whereByUser = " WHERE PCFILIAL.CODIGO <> '99' AND " +
-                            " ((PCFILIAL.CODIGO IN ( SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser )) OR " +
+            " ((PCFILIAL.CODIGO IN ( SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser )) OR " +
-                            "        (EXISTS(SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser AND PCLIB.CODIGOA = '99')) ) ";
+            "        (EXISTS(SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser AND PCLIB.CODIGOA = '99')) ) ";
-        
+
         const orderBy = ` ORDER BY PCFILIAL.CODIGO`
         try {
-            const stores = await queryRunner.query(sql + whereByUser + orderBy, [idUser]); 
+            const stores = await queryRunner.query(sql + whereByUser + orderBy, [idUser]);
             return stores as Store[];
         } catch (error) {
             console.log(error);
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
@@ -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;
@@ -74,7 +74,7 @@ export class ListsService {
             console.log(error);
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
@@ -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;
@@ -97,91 +97,95 @@ export class ListsService {
             console.log(error);
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    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",  ' +
+            const sql = `SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",  
-                        '         NVL(PCPLPAG.NUMDIAS,0) as "numdias" ' +
+                                NVL(PCPLPAG.NUMDIAS,0) as "numdias" 
-                        '    FROM PCPLPAG  ' +     
+                           FROM PCPLPAG, PCCLIENT, PCPLPAG PLANO_CLI   
-                        '    WHERE EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG ' +
+                          WHERE PCCLIENT.CODCLI = :CODCLI
-                        '                  WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG ' + 
+                            AND PCCLIENT.CODPLPAG = PLANO_CLI.CODPLPAG (+)
-                        '                   AND PCCOBPLPAG.CODCOB = :CODCOB ) '
+                            AND PCPLPAG.NUMDIAS <= NVL(PLANO_CLI.NUMDIAS,9999) 
-                        '  ORDER BY PCPAG.DESCRICAO ';
+                            AND EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG 
-            const paymentPlans = await queryRunner.query(sql, [billingId]);
+                                                    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;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    async GetBilling(clienteId: number){
+    async GetBilling(clienteId: number) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = ' SELECT PCCOB.CODCOB as "codcob", PCCOB.CODCOB ||\' - \'||PCCOB.COBRANCA as "cobranca" ' +
-                        '   FROM PCCOB ' +
+                '   FROM PCCOB ' +
-                        '  WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\'  ' + 
+                '  WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\'  ' +
-                        '               AND ( ( NOT EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI  ) AND  ' +
+                '               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 ' +
+                '                                            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 ) ) ' +
+                '                      EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' +
-                        ' ORDER BY PCCOB.CODCOB';
+                ' ORDER BY PCCOB.CODCOB';
             const billings = await queryRunner.query(sql, [clienteId]);
             return billings;
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    async GetPartners(){
+    async GetPartners() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  ESTPARCEIRO.ID as "id" ' +
-                        '         ,REGEXP_REPLACE(ESTPARCEIRO.CPF, \'[^0-9]\',\'\') || \' - \' ||ESTPARCEIRO.NOME as "name"  ' +
+                '         ,REGEXP_REPLACE(ESTPARCEIRO.CPF, \'[^0-9]\',\'\') || \' - \' ||ESTPARCEIRO.NOME as "name"  ' +
-                        '    FROM ESTPARCEIRO '  +
+                '    FROM ESTPARCEIRO ' +
-                        '   WHERE 1 = 1 ';
+                '   WHERE 1 = 1 ';
             const partners = await queryRunner.manager
                 .query(sql);
             return partners;
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    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"        ' +
+                '        ,NOME as "name"        ' +
-                        '        ,TELEFONE as "phone"   ' +
+                '        ,TELEFONE as "phone"   ' +
-                        '        ,IDCART as "idCart"    ' +
+                '        ,IDCART as "idCart"    ' +
-                        '    from estvendaprecliente    ' +
+                '    from estvendaprecliente    ' +
-                        '   where IDCART = :idcart      ';
+                '   where IDCART = :idcart      ';
             console.log(idCart);
             const preCustomer = await queryRunner
                 .query(sql, [idCart]);
@@ -190,95 +194,95 @@ export class ListsService {
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    async GetPlaces(){
+    async GetPlaces() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCPRACA.CODPRACA as "id" ' +
-                        '         ,PCPRACA.PRACA as "name"  ' +
+                '         ,PCPRACA.PRACA as "name"  ' +
-                        '    FROM PCPRACA '  +
+                '    FROM PCPRACA ' +
-                        '   WHERE 1 = 1';
+                '   WHERE 1 = 1';
             const places = await queryRunner.manager
                 .query(sql);
             return places;
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    async GetStorePlaces(){
+    async GetStorePlaces() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCPRACA.CODPRACA as "id" ' +
-                        '         ,PCPRACA.PRACA as "name"  ' +
+                '         ,PCPRACA.PRACA as "name"  ' +
-                        '    FROM PCPRACA '  +
+                '    FROM PCPRACA ' +
-                        '   WHERE PCPRACA.CODPRACAPRINCIPAL = 1004';
+                '   WHERE PCPRACA.CODPRACAPRINCIPAL = 1004';
             const places = await queryRunner.manager
                 .query(sql);
             return places;
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    async GetRamo(){
+    async GetRamo() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCATIVI.CODATIV as "id" ' +
-                        '         ,PCATIVI.RAMO as "name"  ' +
+                '         ,PCATIVI.RAMO as "name"  ' +
-                        '    FROM PCATIVI '  +
+                '    FROM PCATIVI ' +
-                        '   WHERE 1 = 1 ' +
+                '   WHERE 1 = 1 ' +
-                        ' ORDER BY PCATIVI.RAMO';
+                ' ORDER BY PCATIVI.RAMO';
             const ramos = await queryRunner.manager
                 .query(sql);
             return ramos;
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    async GetStates(state: string){
+    async GetStates(state: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCESTADO.ESTADO as "name" FROM PCESTADO' +
-                        '   WHERE  PCESTADO.UF = :1';
+                '   WHERE  PCESTADO.UF = :1';
             const states = await queryRunner.manager
                 .query(sql, [state]);
             return states[0].name;
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
-    async getSupervisores(){
+    async getSupervisores() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -294,9 +298,9 @@ export class ListsService {
         } catch (error) {
             throw error;
         } finally {
-            await queryRunner.release(); 
+            await queryRunner.release();
             await connection.close();
         }
     }
 
- }
+}

src/delivery/services/shipping.service.ts

@@ -127,21 +127,21 @@ export class ShippingService {
       const deliveries = await queryRunner.manager
         .getRepository(Esvretiralojascliente)
         .createQueryBuilder('ESVRETIRALOJASCLIENTE')
-        .select([ 
+        .select([
-                'codfilial        as "codigoFilial"'
+          'codfilial        as "codigoFilial"'
-                ,'numped          as "numeroPedido"'
+          , 'numped          as "numeroPedido"'
-                ,'numnota         as "numeroNota"'
+          , 'numnota         as "numeroNota"'
-                ,'dtfat           as "dataFaturamento"'
+          , 'dtfat           as "dataFaturamento"'
-                ,'datapedido      as "dataPedido"'
+          , 'datapedido      as "dataPedido"'
-                ,'codcli          as "codigoCliente"'
+          , 'codcli          as "codigoCliente"'
-                ,'cliente         as "nomeCliente"'
+          , 'cliente         as "nomeCliente"'
-                ,'codfilialretira as "codigoLoja"'
+          , 'codfilialretira as "codigoLoja"'
-                ,'razaosocial     as "nomeLoja"'
+          , 'razaosocial     as "nomeLoja"'
-                ,'qtitens         as "quantidadeItens"'
+          , 'qtitens         as "quantidadeItens"'
-                ,'quantidade      as "quantidade"'
+          , '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,19 +196,19 @@ 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 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`;
-        const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate);
+      const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate);
 
-        const dataComplete = { dateDelivery: dataDeliveryDate[0].date, deliveries: [...data] };
+      const dataComplete = { dateDelivery: dataDeliveryDate[0].date, deliveries: [...data] };
 
       return dataComplete;
 

src/domain/entity/tables/pccidade.entity.ts

@@ -4,35 +4,32 @@ import { Column, Entity, PrimaryColumn } from "typeorm";
 export class Pccidade {
     @PrimaryColumn({ name: 'CODCIDADE' })
     codcidade: number;
-    
+
     @Column({ name: 'NOMECIDADE' })
     nomecidade: string;
-    
+
     @Column({ name: 'CODIBGE' })
     codibge: number;
-    
+
     @Column({ name: 'UF' })
     uf: string;
-    
+
     @Column({ name: 'POPULACAO' })
     populacao: number;
-    
+
     @Column({ name: 'CODMUNESTADUAL' })
     codmunestadual: number;
-    
+
     @Column({ name: 'UTILIZAFRETETRANSP' })
     utilizafretetransp: string;
-    
+
     @Column({ name: 'CODMUNSIAFI' })
     codmunsiafi: number;
-    
+
-    @Column({ name: 'DTMXSALTER' })
-    dtmxsalter: Date;
-    
     @Column({ name: 'LATITUDE' })
     latitude: string;
-    
+
     @Column({ name: 'LONGITUDE' })
     longitude: string;
-    
+
 }

src/domain/entity/tables/pcorcavendai.entity.ts

@@ -2,94 +2,91 @@ import { Column, Entity, PrimaryColumn } from "typeorm";
 
 @Entity("PCORCAVENDAI")
 export class Pcorcavendai {
-    @PrimaryColumn({name: 'NUMORCA'})
+    @PrimaryColumn({ name: 'NUMORCA' })
     numorca: number;
 
-    @PrimaryColumn({name: 'CODPROD'})
+    @PrimaryColumn({ name: 'CODPROD' })
     codprod: number;
 
-    @PrimaryColumn({name: 'NUMSEQ'})
+    @PrimaryColumn({ name: 'NUMSEQ' })
     numseq: number;
 
-    @Column({name: 'DATA'})
+    @Column({ name: 'DATA' })
     data: Date;
 
-    @Column({name: 'CODCLI'})
+    @Column({ name: 'CODCLI' })
     codcli: number;
 
-    @Column({name: 'CODUSUR'})
+    @Column({ name: 'CODUSUR' })
     codusur: number;
 
-    @Column({name: 'QT'})
+    @Column({ name: 'QT' })
     qt: number;
 
-    @Column({name: 'PVENDA'})
+    @Column({ name: 'PVENDA' })
     pvenda: number;
 
-    @Column({name: 'PTABELA'})
+    @Column({ name: 'PTABELA' })
     ptabela: number;
 
-    @Column({name: 'NUMCAR'})
+    @Column({ name: 'NUMCAR' })
     numcar: number;
 
-    @Column({name: 'POSICAO'})
+    @Column({ name: 'POSICAO' })
     posicao: string;
-    
+
-    @Column({name: 'ST'})
+    @Column({ name: 'ST' })
     st: number;
 
-    @Column({name: 'VLCUSTOFIN'})
+    @Column({ name: 'VLCUSTOFIN' })
     vlcustofin: number;
 
-    @Column({name: 'VLCUSTOREAL'})
+    @Column({ name: 'VLCUSTOREAL' })
     vlcustoreal: number;
 
-    @Column({name: 'PERCOM'})
+    @Column({ name: 'PERCOM' })
     percom: number;
 
-    @Column({name: 'PERDESC'})
+    @Column({ name: 'PERDESC' })
     perdesc: number;
 
-    @Column({name: 'PVENDABASE'})
+    @Column({ name: 'PVENDABASE' })
     pvendabase: number;
 
-    @Column({name: 'CODST'})
+    @Column({ name: 'CODST' })
     codst: number;
 
-    @Column({name: 'CUSTOFINEST'})
+    @Column({ name: 'CUSTOFINEST' })
     custofinest: number;
-        
+
-    @Column({name: 'CODAUXILIAR'})
+    @Column({ name: 'CODAUXILIAR' })
     codauxiliar: number;
 
-    @Column({name: 'CODFILIALRETIRA'})
+    @Column({ name: 'CODFILIALRETIRA' })
     codfilialretira: string;
 
-    @Column({name: 'PORIGINAL'})
+    @Column({ name: 'PORIGINAL' })
     poriginal: number;
 
-    @Column({name: 'VLCUSTOCONT'})
+    @Column({ name: 'VLCUSTOCONT' })
     vlcustocont: number;
 
-    @Column({name: 'VLCUSTOREP'})
+    @Column({ name: 'VLCUSTOREP' })
     vlcustorep: number;
 
-    @Column({name: 'PBASERCA'})
+    @Column({ name: 'PBASERCA' })
     pbaserca: number;
 
-    @Column({name: 'PVENDA1'})
+    @Column({ name: 'PVENDA1' })
     pvenda1: number;
 
-    @Column({name: 'TIPOENTREGA'})
+    @Column({ name: 'TIPOENTREGA' })
     tipoentrega: string;
 
-    @Column({name: 'COMPLEMENTO'})
+    @Column({ name: 'COMPLEMENTO' })
     complemento: string;
 
-    @Column({name: 'AMBIENTE'})
+    @Column({ name: 'AMBIENTE' })
     ambiente: string;
 
-    @Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
-    rp_imediata: string;
-    
 }

src/domain/entity/tables/pcpeditemp.entity.ts

@@ -3,167 +3,165 @@ import { Column, Entity, PrimaryColumn } from "typeorm";
 @Entity('PCPEDITEMP')
 export class Pcpeditemp {
 
-@Column({ name: 'TIPOINTEGRACAO' })
+    @Column({ name: 'TIPOINTEGRACAO' })
-tipointegracao: string;
+    tipointegracao: string;
 
-@Column({ name: 'OBSERVACAO_PC' })
+    @Column({ name: 'OBSERVACAO_PC' })
-observacao_pc: string;
+    observacao_pc: string;
 
-@Column({ name: 'NUMPEDCLI' })
+    @Column({ name: 'NUMPEDCLI' })
-numpedcli: string;
+    numpedcli: string;
 
-@PrimaryColumn({ name: 'NUMPEDRCA' })
+    @PrimaryColumn({ name: 'NUMPEDRCA' })
-numpedrca: number;
+    numpedrca: number;
 
-@Column({ name: 'CODCLI' })
+    @Column({ name: 'CODCLI' })
-codcli: number;
+    codcli: number;
 
-@Column({ name: 'CODUSUR' })
+    @Column({ name: 'CODUSUR' })
-codusur: number;
+    codusur: number;
 
-@Column({ name: 'DATA' })
+    @Column({ name: 'DATA' })
-data: Date;
+    data: Date;
 
-@PrimaryColumn({ name: 'CODPROD' })
+    @PrimaryColumn({ name: 'CODPROD' })
-codprod: number;
+    codprod: number;
 
-@Column({ name: 'QT' })
+    @Column({ name: 'QT' })
-qt: number;
+    qt: number;
 
-@Column({ name: 'QT_FATURADA' })
+    @Column({ name: 'QT_FATURADA' })
-qt_faturada: number;
+    qt_faturada: number;
 
-@Column({ name: 'PVENDA' })
+    @Column({ name: 'PVENDA' })
-pvenda: number;
+    pvenda: number;
 
-@Column({ name: 'PTABELA' })
+    @Column({ name: 'PTABELA' })
-ptabela: number;
+    ptabela: number;
 
-@Column({ name: 'PERDESC' })
+    @Column({ name: 'PERDESC' })
-perdesc: number;
+    perdesc: number;
 
-@PrimaryColumn({ name: 'NUMSEQ' })
+    @PrimaryColumn({ name: 'NUMSEQ' })
-numseq: number;
+    numseq: number;
 
-@Column({ name: 'CODAUXILIAR' })
+    @Column({ name: 'CODAUXILIAR' })
-codauxiliar: number;
+    codauxiliar: number;
 
-@Column({ name: 'CODCERTIFIC' })
+    @Column({ name: 'CODCERTIFIC' })
-codcertific: number;
+    codcertific: number;
 
-@Column({ name: 'CODFILIALRETIRA' })
+    @Column({ name: 'CODFILIALRETIRA' })
-codfilialretira: string;
+    codfilialretira: string;
 
-@Column({ name: 'NUMLOTE' })
+    @Column({ name: 'NUMLOTE' })
-numlote: string;
+    numlote: string;
 
-@Column({ name: 'COMPLEMENTO' })
+    @Column({ name: 'COMPLEMENTO' })
-complemento: string;
+    complemento: string;
 
-@Column({ name: 'CODPLPAG' })
+    @Column({ name: 'CODPLPAG' })
-codplpag: number;
+    codplpag: number;
 
-@Column({ name: 'CODPROMOCAO' })
+    @Column({ name: 'CODPROMOCAO' })
-codpromocao: string;
+    codpromocao: string;
 
-@Column({ name: 'PRAZOMEDIO' })
+    @Column({ name: 'PRAZOMEDIO' })
-prazomedio: number;
+    prazomedio: number;
 
-@Column({ name: 'LOCALIZACAO' })
+    @Column({ name: 'LOCALIZACAO' })
-localizacao: string;
+    localizacao: string;
 
-@Column({ name: 'PBONIFIC' })
+    @Column({ name: 'PBONIFIC' })
-pbonific: number;
+    pbonific: number;
 
-@Column({ name: 'CODDEGUSTACAO' })
+    @Column({ name: 'CODDEGUSTACAO' })
-coddegustacao: number;
+    coddegustacao: number;
 
-@Column({ name: 'PESOBRUTO' })
+    @Column({ name: 'PESOBRUTO' })
-pesobruto: number;
+    pesobruto: number;
 
-@Column({ name: 'EANCODPROD' })
+    @Column({ name: 'EANCODPROD' })
-eancodprod: number;
+    eancodprod: number;
 
-@Column({ name: 'CODNAOATENDIMENTO' })
+    @Column({ name: 'CODNAOATENDIMENTO' })
-codnaoatendimento: number;
+    codnaoatendimento: number;
 
-@Column({ name: 'OBSINTEGRACAO1' })
+    @Column({ name: 'OBSINTEGRACAO1' })
-obsintegracao1: string;
+    obsintegracao1: string;
 
-@Column({ name: 'OBSINTEGRACAO2' })
+    @Column({ name: 'OBSINTEGRACAO2' })
-obsintegracao2: string;
+    obsintegracao2: string;
 
-@Column({ name: 'NUMPEDWEB' })
+    @Column({ name: 'NUMPEDWEB' })
-numpedweb: number;
+    numpedweb: number;
 
-@Column({ name: 'TRANSACAO' })
+    @Column({ name: 'TRANSACAO' })
-transacao: number;
+    transacao: number;
 
-@Column({ name: 'IDVENDA' })
+    @Column({ name: 'IDVENDA' })
-idvenda: number;
+    idvenda: number;
 
-@Column({ name: 'INTEGRADORA' })
+    @Column({ name: 'INTEGRADORA' })
-integradora: number;
+    integradora: number;
 
-@Column({ name: 'CODRETORNO' })
+    @Column({ name: 'CODRETORNO' })
-codretorno: number;
+    codretorno: number;
 
-@Column({ name: 'COMISSAOATIM' })
+    @Column({ name: 'COMISSAOATIM' })
-comissaoatim: number;
+    comissaoatim: number;
 
-@Column({ name: 'TIPOENTREGA' })
+    @Column({ name: 'TIPOENTREGA' })
-tipoentrega: string;
+    tipoentrega: string;
 
-@Column({ name: 'CODRETORNOS' })
+    @Column({ name: 'CODRETORNOS' })
-codretornos: string;
+    codretornos: string;
 
-@Column({ name: 'DTINCLUSAO' })
+    @Column({ name: 'DTINCLUSAO' })
-dtinclusao: Date;
+    dtinclusao: Date;
 
-@Column({ name: 'CODPRODCESTA' })
+    @Column({ name: 'CODPRODCESTA' })
-codprodcesta: number;
+    codprodcesta: number;
 
-@Column({ name: 'BONIFIC' })
+    @Column({ name: 'BONIFIC' })
-bonific: string;
+    bonific: string;
 
-@Column({ name: 'DTIMP' })
+    @Column({ name: 'DTIMP' })
-dtimp: Date;
+    dtimp: Date;
 
-@Column({ name: 'PBASERCA' })
+    @Column({ name: 'PBASERCA' })
-pbaserca: number;
+    pbaserca: number;
 
-@Column({ name: 'VLFRETE' })
+    @Column({ name: 'VLFRETE' })
-vlfrete: number;
+    vlfrete: number;
 
-@Column({ name: 'FATORCONVERSAO' })
+    @Column({ name: 'FATORCONVERSAO' })
-fatorconversao: number;
+    fatorconversao: number;
 
-@Column({ name: 'IDKITPRODUTO' })
+    @Column({ name: 'IDKITPRODUTO' })
-idkitproduto: string;
+    idkitproduto: string;
 
-@Column({ name: 'MOVIMENTACONTACORRENTERCA' })
+    @Column({ name: 'MOVIMENTACONTACORRENTERCA' })
-movimentacontacorrenterca: string;
+    movimentacontacorrenterca: string;
 
-@Column({ name: 'PORIGINAL' })
+    @Column({ name: 'PORIGINAL' })
-poriginal: number;
+    poriginal: number;
 
-@Column({ name: 'ESC_EMBALAGEMPRESENTE' })
+    @Column({ name: 'ESC_EMBALAGEMPRESENTE' })
-esc_embalagempresente: string;
+    esc_embalagempresente: string;
 
-@Column({ name: 'QTUNITEMB' })
+    @Column({ name: 'QTUNITEMB' })
-qtunitemb: number;
+    qtunitemb: number;
 
-@Column({ name: 'IDREMESSAWEB' })
+    @Column({ name: 'IDREMESSAWEB' })
-idremessaweb: number;
+    idremessaweb: number;
 
-@Column({ name: 'CODFILIAL' })
+    @Column({ name: 'CODFILIAL' })
-codfilial: string;
+    codfilial: string;
 
-@Column({ name: 'CODCLIPARTILHA' })
+    @Column({ name: 'CODCLIPARTILHA' })
-codclipartilha: number;
+    codclipartilha: number;
 
-@Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
-rp_imediata: string;
 
 }
 

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.codplpag = 18;
-        cliente.codpraca = 119;
+        cliente.codpraca = 169;
-        cliente.codcob = "D";
+        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

@@ -586,7 +586,7 @@ export class OrderService {
                         itemOrder.codauxiliar = componente.ean;
                         itemOrder.codfilialretira = item.idStock;
                         itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
-                        itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
+                        //  itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
                         if (item.deliveryMethod == 'RA') {
                             preOrder.dtentrega = new Date();
                         }
@@ -619,7 +619,7 @@ export class OrderService {
                     itemOrder.codauxiliar = item.ean;
                     itemOrder.codfilialretira = item.idStock;
                     itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
-                    itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
+                    //itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
                     if (item.deliveryMethod == 'RA') {
                         preOrder.dtentrega = new Date();
                     }
@@ -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

@@ -51,7 +51,7 @@ export class PreOrderService {
             if (shopping.length > 0) {
                 idPreOrder = shopping[0].idPreOrder;
                 const existPreOrder = await queryRunner
-                        .query('SELECT PCORCAVENDAC.CODUSUR as "idRca" FROM PCORCAVENDAC WHERE NUMORCA = :NUMORCA', [idPreOrder]);
+                    .query('SELECT PCORCAVENDAC.CODUSUR as "idRca" FROM PCORCAVENDAC WHERE NUMORCA = :NUMORCA', [idPreOrder]);
                 idRca = existPreOrder[0].idRca;
                 await queryRunner.query('DELETE FROM PCORCAVENDAI WHERE NUMORCA = :1', [idPreOrder]);
                 await queryRunner.query('DELETE FROM PCORCAVENDAC WHERE NUMORCA = :1', [idPreOrder]);
@@ -70,9 +70,9 @@ export class PreOrderService {
                     cart.id, cart.preCustomerName, cart.preCustomerPhone, cart.idSeller, idPreOrder]);
                 }
             } else {
-                if ( cart.preCustomerDocument != null ) {
+                if (cart.preCustomerDocument != null) {
-                    await queryRunner.query(`DELETE FROM ESTVENDAPRECLIENTE WHERE IDCART = :1 AND REGEXP_REPLACE(:CPF, '[^0-9]', '')`, 
+                    await queryRunner.query(`DELETE FROM ESTVENDAPRECLIENTE WHERE IDCART = :1 AND REGEXP_REPLACE(:CPF, '[^0-9]', '')`,
-                    [cart.id, cart.preCustomerDocument]); 
+                        [cart.id, cart.preCustomerDocument]);
                 }
             }
 
@@ -92,7 +92,7 @@ export class PreOrderService {
                 itemPreOrder.codcli = cart.idCustomer;
                 itemPreOrder.codprod = item.idProduct;
                 itemPreOrder.codauxiliar = item.ean;
-                itemPreOrder.codusur = ( idRca > 0 ) ? idRca : cart.idSeller;
+                itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
                 itemPreOrder.qt = item.quantity;
                 itemPreOrder.pvenda = item.salePrice;
                 itemPreOrder.ptabela = item.listPrice;
@@ -120,7 +120,7 @@ export class PreOrderService {
                 itemPreOrder.pvenda1 = 0;
                 itemPreOrder.tipoentrega = item.deliveryMethod;
                 // eslint-disable-next-line @typescript-eslint/camelcase
-                itemPreOrder.rp_imediata = (item.deliveryMethod == "RA") ? "S" : "N";
+                // itemPreOrder.rp_imediata = (item.deliveryMethod == "RA") ? "S" : "N";
                 itemPreOrder.complemento = item.descriptionAux;
                 itemPreOrder.ambiente = item.environment;
 
@@ -137,52 +137,52 @@ export class PreOrderService {
                 numeroSeq = numeroSeq + 1;
             }
 
-            if (cart.shippingValue > 0) {
+            // if (cart.shippingValue > 0) {
-                const itemPreOrder = new Pcorcavendai();
+            //     const itemPreOrder = new Pcorcavendai();
-                itemPreOrder.numorca = preOrder.numorca;
+            //     itemPreOrder.numorca = preOrder.numorca;
-                itemPreOrder.data = this.formatDate(new Date());
+            //     itemPreOrder.data = this.formatDate(new Date());
-                itemPreOrder.codcli = cart.idCustomer;
+            //     itemPreOrder.codcli = cart.idCustomer;
-                itemPreOrder.codprod = 48500;
+            //     itemPreOrder.codprod = 48500;
-                itemPreOrder.codauxiliar = 48500;
+            //     itemPreOrder.codauxiliar = 48500;
-                itemPreOrder.codusur = ( idRca > 0 ) ? idRca : cart.idSeller;
+            //     itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
-                itemPreOrder.qt = 1;
+            //     itemPreOrder.qt = 1;
-                itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
+            //     itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
-                itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
+            //     itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
-                itemPreOrder.numcar = 0;
+            //     itemPreOrder.numcar = 0;
-                itemPreOrder.posicao = 'L';
+            //     itemPreOrder.posicao = 'L';
-                itemPreOrder.st = 0;
+            //     itemPreOrder.st = 0;
-                itemPreOrder.vlcustocont = 0;
+            //     itemPreOrder.vlcustocont = 0;
-                itemPreOrder.vlcustofin = 0;
+            //     itemPreOrder.vlcustofin = 0;
-                itemPreOrder.vlcustoreal = 0;
+            //     itemPreOrder.vlcustoreal = 0;
-                itemPreOrder.vlcustorep = 0;
+            //     itemPreOrder.vlcustorep = 0;
-                itemPreOrder.percom = 0;
+            //     itemPreOrder.percom = 0;
-                itemPreOrder.perdesc = 0;
+            //     itemPreOrder.perdesc = 0;
-                itemPreOrder.numseq = numeroSeq;
+            //     itemPreOrder.numseq = numeroSeq;
-                itemPreOrder.pvendabase = 0;
+            //     itemPreOrder.pvendabase = 0;
-                itemPreOrder.codst = await this.
+            //     itemPreOrder.codst = await this.
-                    sharedService.
+            //         sharedService.
-                    getTaxId(48500,
+            //         getTaxId(48500,
-                        cart.saleStore,
+            //             cart.saleStore,
-                        customer.estent);
+            //             customer.estent);
-                itemPreOrder.custofinest = 0;
+            //     itemPreOrder.custofinest = 0;
-                itemPreOrder.codauxiliar = 48500;
+            //     itemPreOrder.codauxiliar = 48500;
-                itemPreOrder.codfilialretira = cart.saleStore;
+            //     itemPreOrder.codfilialretira = cart.saleStore;
-                itemPreOrder.poriginal = 0;
+            //     itemPreOrder.poriginal = 0;
-                itemPreOrder.pvendabase = 0;
+            //     itemPreOrder.pvendabase = 0;
-                itemPreOrder.pvenda1 = 0;
+            //     itemPreOrder.pvenda1 = 0;
-                itemPreOrder.tipoentrega = 'EF';
+            //     itemPreOrder.tipoentrega = 'EF';
-                console.log('Processo 3');
+            //     console.log('Processo 3');
 
-                await queryRunner.manager
+            //     await queryRunner.manager
-                    .createQueryBuilder()
+            //         .createQueryBuilder()
-                    .insert()
+            //         .insert()
-                    .into(Pcorcavendai)
+            //         .into(Pcorcavendai)
-                    .values(itemPreOrder)
+            //         .values(itemPreOrder)
-                    .execute();
+            //         .execute();
-                console.log('Processo 4');
+            //     console.log('Processo 4');
 
-                numeroSeq = numeroSeq + 1;
+            //     numeroSeq = numeroSeq + 1;
-            }
+            // }
 
             //#region create PCORCAVENDAC
             console.log('Processo 5' + cart);
@@ -201,7 +201,7 @@ export class PreOrderService {
             preOrder.minuto = new Date().getMinutes();
             preOrder.dtentrega = cart.shippingDate; // dateDelivery;
             preOrder.codfilial = cart.saleStore,
-            preOrder.codusur = ( idRca > 0 ) ? idRca : cart.idSeller;
+                preOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
             preOrder.codemitente = cart.userId;
             preOrder.codusur3 = cart.idProfessional;
             preOrder.tipoprioridadeentrega = cart.shippingPriority;
@@ -209,8 +209,8 @@ export class PreOrderService {
                 preOrder.codsupervisor = supervisor[0].codsupervisor;
             }
             preOrder.codemitente = cart.userId;
-            preOrder.vlfrete = cart.shippingValue;
+            preOrder.vlfrete = 0;
-            preOrder.vloutrasdesp = 0;
+            preOrder.vloutrasdesp = cart.shippingValue;
             preOrder.numitens = cart.itens.length;
             preOrder.obs1 = cart.notation1;
             preOrder.obs2 = cart.notation2;
@@ -352,12 +352,12 @@ export class PreOrderService {
                 sql += ` AND PCORCAVENDAC.NUMORCA = ${idPreOrder}  `;
             }
 
-            if ( document.length > 0 ) {
+            if (document.length > 0) {
-                sql += ` AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE(${document}, '[^0-9]', '')  `; 
+                sql += ` AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE(${document}, '[^0-9]', '')  `;
             }
 
-            if ( nameCustomer.length > 0 ) {
+            if (nameCustomer.length > 0) {
-                sql += ` AND PCCLIENT.CLIENTE LIKE UPPER('${nameCustomer}')||'%'  `; 
+                sql += ` AND PCCLIENT.CLIENTE LIKE UPPER('${nameCustomer}')||'%'  `;
             }
 
             const preOrders =
@@ -411,7 +411,7 @@ export class PreOrderService {
             }
 
             await queryRunner.query("BEGIN ESK_VENDA.ATUALIZAR_PRECO_VENDA(:idcart, :paymentPlanId); END;",
-                 [preOrder[0].cartId, preOrder[0].paymentPlanId]);
+                [preOrder[0].cartId, preOrder[0].paymentPlanId]);
 
             const invoiceStores = await this.listsService.GetStoreAll();
             const invoiceStore = await invoiceStores.find(data => data.id === preOrder[0].invoiceStore);
@@ -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);