@things-factory/worksheet-base 4.3.211 → 4.3.213

package/server/utils/lmd-util.ts

@@ -34,7 +34,7 @@ export async function createLmdParcel(releaseGoods, tx) {
       const senderGeoArea: GeoArea = await tx
         .getRepository(GeoArea)
         .findOne({ where: { postalCode: bizplace.postalCode } })
-      
+
       const recipientGeoArea: GeoArea = await tx
         .getRepository(GeoArea)
         .findOne({ where: { postalCode: releaseGood.postalCode } })
@@ -75,7 +75,7 @@ export async function createLmdParcel(releaseGoods, tx) {
       let packagesData = unprocessedOrderPackages.map(op => {
         return {
           ...data,
-          refNo: op.id,
+          refNo: op.name,
           items: op.orderPackageItems.map(opi => {
             return {
               quantity: opi?.releaseQty?.toString() || ' ',
@@ -99,17 +99,22 @@ export async function createLmdParcel(releaseGoods, tx) {
         parcelsRequest
       )
       for (let parcel of res) {
-        await tx.getRepository(OrderPackage).update({ id: parcel.refNo }, { parcelId: parcel.parcelId })
+        await tx.getRepository(OrderPackage).update({ name: parcel.refNo }, { parcelId: parcel.parcelId })
       }
 
-      const qb: SelectQueryBuilder<OrderPackage> = tx.getRepository(OrderPackage)
+      const qb: SelectQueryBuilder<OrderPackage> = tx
+        .getRepository(OrderPackage)
         .createQueryBuilder('op')
         .innerJoinAndSelect('op.releaseGood', 'rg')
         .innerJoinAndSelect('rg.domain', 'd')
         .innerJoinAndSelect('rg.bizplace', 'b')
         .innerJoinAndSelect('b.domain', 'd2')
         .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
-        .where('op.id IN (:...orderPackageIds)', { orderPackageIds: res.map(parcel => { return parcel.refNo }) })
+        .where('op.name IN (:...orderPackageIds)', {
+          orderPackageIds: res.map(parcel => {
+            return parcel.refNo
+          })
+        })
 
       const orderPackages: OrderPackage[] = await qb.getMany()
       await processAwbAndTrackingNo(orderPackages, tx)
@@ -124,30 +129,37 @@ export async function processAwbAndTrackingNo(orderPackages, tx) {
 
   for (let orderPackage of orderPackages) {
     // await getConnection().transaction(async tx => {
-      try {
-        let awbRes = await LastMileAPI.getAwb(
-          { ...orderPackage.releaseGood.lastMileDelivery, platform: 'lmdMiddleware' },
-          { parcelId: orderPackage.parcelId, staging: orderPackage.releaseGood.lastMileDelivery?.staging }
-        )
-
-        if (awbRes) {
-          let awbContent: any
-          const { deliveryConfirmationNo, tracking_no } = awbRes
-          if (awbRes.content) {
-            awbContent = Buffer.from(awbRes.content, 'base64')
+    try {
+      let awbRes = await LastMileAPI.getAwb(
+        { ...orderPackage.releaseGood.lastMileDelivery, platform: 'lmdMiddleware' },
+        { parcelId: orderPackage.parcelId, staging: orderPackage.releaseGood.lastMileDelivery?.staging }
+      )
+
+      if (awbRes) {
+        let awbContent: any
+        let awb: any
+        const { deliveryConfirmationNo, tracking_no } = awbRes
+        if (awbRes.content) {
+          if (orderPackage.releaseGood.lastMileDelivery.platform == 'POSLAJU' || orderPackage.releaseGood.lastMileDelivery.platform == 'SAPX') {
+            const response: any = await fetch(awbRes.content, {
+              method: 'get'
+            })
+            awbContent = await response.buffer()
           } else {
-            awbContent = await constructAwb(orderPackage, awbRes)
+            awbContent = Buffer.from(awbRes.content, 'base64')
           }
-          const awb = await uploadAwbToS3(awbContent, orderPackage)
-          await tx.getRepository(OrderPackage).update(
-            { id: orderPackage.id },
-            { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no }
-          )
-          releaseOrders.push(orderPackage.releaseGood)
+        } else {
+          awbContent = await constructAwb(orderPackage, awbRes)
         }
-      } catch (e) {
-        logger.error(e)
+        awb = await uploadAwbToS3(awbContent, orderPackage)
+        await tx
+          .getRepository(OrderPackage)
+          .update({ name: orderPackage.name }, { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no })
+        releaseOrders.push(orderPackage.releaseGood)
       }
+    } catch (e) {
+      logger.error(e)
+    }
     // })
   }
 
@@ -264,7 +276,7 @@ async function uploadAwbToS3(result, orderPackage) {
     name: uuid,
     mimetype: 'application/pdf',
     category: 'LMD_AWB',
-    refBy: orderPackage.id,
+    refBy: orderPackage.name,
     path: awb.url,
     domain: releaseOrder.domain,
     size: 0,