@things-factory/worksheet-base 4.3.67 → 4.3.70

package/server/graphql/resolvers/worksheet/packing-worksheet.ts

@@ -1,6 +1,7 @@
-import { EntityManager, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, SelectQueryBuilder, getManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
+import { logger } from '@things-factory/env'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
   MarketplaceOrder,
@@ -102,20 +103,15 @@ export const packingWorksheetResolver = {
       let marketplaceStatus: string
 
       if (releaseGood.type === 'b2c') {
+
         const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
           domain: worksheet.bizplace.domain,
           status: SellercraftStatus.ACTIVE
         })
 
         if (sellercraft) {
-          if (!releaseGood?.airwayBill) {
-            const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-            sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
-            releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-          }
-          trackingNo = releaseGood?.trackingNo
-          shippingProvider = releaseGood?.transporter
-          marketplaceStatus = releaseGood?.marketplaceOrderStatus
+          // asynchronously get document from sellercraft
+          getSellercraftDocument(sellercraft, releaseGood, domain, user)
         } else {
           marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
             where: { orderNo: releaseGood.refNo },
@@ -242,3 +238,34 @@ export async function getTrackingNo(marketplaceStore, marketplaceOrderItems): Pr
 
   return trackingNo
 }
+
+//trigger RTS, init document, and fetch sellercraft document in separated transaction
+async function getSellercraftDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood, domain: Domain, user: User) {
+  await getManager().transaction(async txMgr => {
+    const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
+    try {
+      if (!releaseGood?.airwayBill) {
+        try {
+          // try fetch order document / AWB
+          releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+        } catch (error) {
+          try {
+            // retry initiate order document
+            await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+          } catch (error) {
+            try {
+              // retry initiate order shipment / RTS
+              await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+            } catch (error) {
+              throw new Error(`initiateOrderShipment: ${error}`)
+            }
+            throw new Error(`initiateOrderDocument: ${error}`)
+          }
+          throw new Error(`fetchOrderDocument: ${error}`)
+        }
+      }
+    } catch (error) {
+      logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({ sellercraft, releaseGood, domain, user })}) ${error} `)
+    }
+  })
+}

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, getManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
@@ -82,30 +82,34 @@ export async function completePicking(
   await pickingWSCtrl.completePicking(releaseGoodNo)
 
   if (releaseGood.type == 'b2c') {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const initSCOrderShipment = async (sellercraft) => {
+      if (sellercraft) {
 
-      if (!releaseGood?.packageId) {
-        const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
-          where: { releaseGood },
-          relations: ['product', 'product.productDetails']
-        })
-        releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
+        await getManager().transaction(async txMgr => {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
 
-        if (releaseGood?.packageId) {
-          await tx
-            .getRepository(ReleaseGood)
-            .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
-        }
-      }
+          if (!releaseGood?.packageId) {
+            const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
+              where: { releaseGood },
+              relations: ['product', 'product.productDetails']
+            })
+            releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
+
+            if (releaseGood?.packageId) {
+              await txMgr.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
+            }
+          }
 
-      sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+          await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+        })
+      }
     }
 
+    // asynchronouly call to initiate sellercraft order shipment/ RTS
+    initSCOrderShipment(sellercraft)
+
     const companyDomain: Domain = releaseGood.bizplace.company.domain
     let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
       where: { orderNo: releaseGood.refNo, domain: companyDomain },

package/server/graphql/types/worksheet/delivery-order-info.ts

@@ -2,6 +2,7 @@ import { gql } from 'apollo-server-koa'
 
 export const DeliveryOrderInfo = gql`
   type DeliveryOrderInfo {
+    name: String
     ownCollection: Boolean
     doStatus: String
     truckNo: String
@@ -17,5 +18,7 @@ export const DeliveryOrderInfo = gql`
     reusablePallet: String
     createdDate: String
     isManualDo: Boolean
+    releaseGood: ReleaseGood
+    productList: [Product]
   }
 `

package/server/graphql/types/worksheet/index.ts

@@ -1,4 +1,4 @@
-import { AirwayBill } from './airwaybill'
+import { SellercraftDocument } from './sellercraft-document'
 import { ArrivalNoticeWorksheet } from './arrival-notice-worksheet'
 import { ContactPointInfo } from './contact-point-info'
 import { CycleCountWorksheet } from './cycle-count-worksheet'
@@ -68,9 +68,9 @@ export const Mutation = /* GraphQL */ `
     releaseGoodNos: [String!]
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
-  fetchSellercraftAirwayBill (
-    releaseGoodNo: String!
-  ): AirwayBill @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+  fetchSellercraftDocument (
+    releaseGoodId: String!
+  ): SellercraftDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateSortingWorksheet (
     worksheetNo: String!
@@ -628,7 +628,7 @@ export const Query = /* GraphQL */ `
 
   deliveryOrderByWorksheet (
     name: String!
-  ): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query")
+  ): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query") @transaction
 
   fetchDeliveryOrderRO (
     name: String!
@@ -718,7 +718,7 @@ export const Query = /* GraphQL */ `
 
 export const Types = /* GraphQL */[
   Worksheet,
-  AirwayBill,
+  SellercraftDocument,
   NewWorksheet,
   WorksheetPatch,
   WorksheetList,

package/server/graphql/types/worksheet/sellercraft-document.ts

@@ -0,0 +1,8 @@
+import { gql } from 'apollo-server-koa'
+
+export const SellercraftDocument = gql`
+  type SellercraftDocument {
+    airwayBill: String,
+    invoice: String
+  }
+`

package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-airway-bill.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchSellercraftAirwayBillResolver = void 0;
-const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
-const sales_base_1 = require("@things-factory/sales-base");
-const controllers_1 = require("../../../controllers");
-exports.fetchSellercraftAirwayBillResolver = {
-    async fetchSellercraftAirwayBill(_, { releaseGoodNo }, context) {
-        const { tx, domain, user } = context.state;
-        let releaseGood = await tx
-            .getRepository(sales_base_1.ReleaseGood)
-            .findOne({ where: { domain, name: releaseGoodNo }, relations: ['bizplace', 'bizplace.domain'] });
-        const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
-            domain: releaseGood.bizplace.domain,
-            status: integration_sellercraft_1.SellercraftStatus.ACTIVE
-        });
-        if (sellercraft && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
-            const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
-            await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
-        }
-        const airwayBill = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill;
-        return { airwayBill };
-    }
-};
-//# sourceMappingURL=fetch-sellercraft-airway-bill.js.map

package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-airway-bill.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fetch-sellercraft-airway-bill.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/fetch-sellercraft-airway-bill.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AACxF,2DAAwD;AAGxD,sDAA4D;AAE/C,QAAA,kCAAkC,GAAG;IAChD,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QACtE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,WAAW,GAAgB,MAAM,EAAE;aACpC,aAAa,CAAC,wBAAW,CAAC;aAC1B,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAA;QAElG,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,qCAAW,CAAC,CAAC,OAAO,CAAC;YAC3E,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM;YACnC,MAAM,EAAE,2CAAiB,CAAC,MAAM;SACjC,CAAC,CAAA;QAEF,IAAI,WAAW,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;YAC3C,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;SACnE;QAED,MAAM,UAAU,GAAW,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA;QAClD,OAAO,EAAE,UAAU,EAAE,CAAA;IACvB,CAAC;CACF,CAAA"}

package/dist-server/graphql/types/worksheet/airwaybill.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AirwayBill = void 0;
-const apollo_server_koa_1 = require("apollo-server-koa");
-exports.AirwayBill = (0, apollo_server_koa_1.gql) `
-  type AirwayBill {
-    airwayBill: String
-  }
-`;
-//# sourceMappingURL=airwaybill.js.map

package/dist-server/graphql/types/worksheet/airwaybill.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"airwaybill.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/airwaybill.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,UAAU,GAAG,IAAA,uBAAG,EAAA;;;;CAI5B,CAAA"}

package/server/graphql/resolvers/worksheet/fetch-sellercraft-airway-bill.ts

@@ -1,30 +0,0 @@
-import { EntityManager } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { ReleaseGood } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
-
-import { SellercraftController } from '../../../controllers'
-
-export const fetchSellercraftAirwayBillResolver = {
-  async fetchSellercraftAirwayBill(_: any, { releaseGoodNo }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    let releaseGood: ReleaseGood = await tx
-      .getRepository(ReleaseGood)
-      .findOne({ where: { domain, name: releaseGoodNo }, relations: ['bizplace', 'bizplace.domain'] })
-
-    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
-      domain: releaseGood.bizplace.domain,
-      status: SellercraftStatus.ACTIVE
-    })
-
-    if (sellercraft && !releaseGood?.airwayBill) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-    }
-
-    const airwayBill: string = releaseGood?.airwayBill
-    return { airwayBill }
-  }
-}

package/server/graphql/types/worksheet/airwaybill.ts

@@ -1,7 +0,0 @@
-import { gql } from 'apollo-server-koa'
-
-export const AirwayBill = gql`
-  type AirwayBill {
-    airwayBill: String
-  }
-`