Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api

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

@@ -26,9 +26,6 @@ export class Pccidade {
     @Column({ name: 'CODMUNSIAFI' })
     codmunsiafi: number;
 
-    @Column({ name: 'DTMXSALTER' })
-    dtmxsalter: Date;
-    
     @Column({ name: 'LATITUDE' })
     latitude: string;
 

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

@@ -89,7 +89,4 @@ export class Pcorcavendai {
     @Column({ name: 'AMBIENTE' })
     ambiente: string;
 
-    @Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
-    rp_imediata: string;
-    
 }

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

@@ -162,8 +162,6 @@ codfilial: string;
     @Column({ name: 'CODCLIPARTILHA' })
     codclipartilha: number;
 
-@Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
-rp_imediata: string;
 
 }
 

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();
                     }

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

@@ -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;