@things-factory/worksheet-base 4.3.143 → 4.3.146

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Types = exports.Query = exports.Mutation = void 0;
-const sellercraft_document_1 = require("./sellercraft-document");
 const arrival_notice_worksheet_1 = require("./arrival-notice-worksheet");
+const batch_pick_worksheet_info_1 = require("./batch-pick-worksheet-info");
 const contact_point_info_1 = require("./contact-point-info");
 const cycle_count_worksheet_1 = require("./cycle-count-worksheet");
 const delivery_info_1 = require("./delivery-info");
@@ -14,12 +14,14 @@ const find_release_orders_by_task_no_1 = require("./find-release-orders-by-task-
 const goods_delivery_note_1 = require("./goods-delivery-note");
 const inventory_check_worksheet_1 = require("./inventory-check-worksheet");
 const loaded_worksheet_detail_1 = require("./loaded-worksheet-detail");
+const multiple_release_good_worksheet_1 = require("./multiple-release-good-worksheet");
 const my_picking_assignment_status_1 = require("./my-picking-assignment-status");
 const new_worksheet_1 = require("./new-worksheet");
 const picking_assignment_status_1 = require("./picking-assignment-status");
 const product_approval_1 = require("./product-approval");
 const release_good_worksheet_1 = require("./release-good-worksheet");
 const return_order_worksheet_1 = require("./return-order-worksheet");
+const sellercraft_document_1 = require("./sellercraft-document");
 const vas_order_worksheet_1 = require("./vas-order-worksheet");
 const worksheet_1 = require("./worksheet");
 const worksheet_detail_info_1 = require("./worksheet-detail-info");
@@ -27,8 +29,6 @@ const worksheet_info_1 = require("./worksheet-info");
 const worksheet_list_1 = require("./worksheet-list");
 const worksheet_patch_1 = require("./worksheet-patch");
 const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
-const batch_pick_worksheet_info_1 = require("./batch-pick-worksheet-info");
-const multiple_release_good_worksheet_1 = require("./multiple-release-good-worksheet");
 exports.Mutation = `
   createWorksheet (
     worksheet: NewWorksheet!
@@ -357,13 +357,13 @@ exports.Mutation = `
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (
-    worksheetDetailName: String!
+    orderPackageItemId: String!
     releaseQty: Int!
     serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPacking (
-    worksheetDetailName: String!
+    orderPackageItemId: String!
     productBarcode: String!
     serialNumber: String
   ): ExecutingWorksheet @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -440,6 +440,7 @@ exports.Mutation = `
 
   completePacking (
     releaseGoodNo: String!
+    orderPackageId: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   completeBatchPicking (

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAC5D,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,2EAAmE;AACnE,uFAAgF;AAEnE,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgiBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgJlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,0CAAmB;IACnB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiiBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgJlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,0CAAmB;IACnB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}

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

@@ -31,6 +31,8 @@ exports.WorksheetInfo = (0, apollo_server_koa_1.gql) `
     refNo3: String
     looseItem: String
     orderVas: [WorksheetDetail]
+    orderPackage: OrderPackage
+    orderPackages: [OrderPackage]
   }
 `;
 //# sourceMappingURL=worksheet-info.js.map

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.143",
+  "version": "4.3.146",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,22 +23,22 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.142",
-    "@things-factory/biz-base": "^4.3.142",
-    "@things-factory/document-template-base": "^4.3.142",
-    "@things-factory/id-rule-base": "^4.3.142",
-    "@things-factory/integration-accounting": "^4.3.143",
-    "@things-factory/integration-lmd": "^4.3.142",
-    "@things-factory/integration-marketplace": "^4.3.142",
-    "@things-factory/integration-sellercraft": "^4.3.142",
-    "@things-factory/integration-sftp": "^4.3.142",
-    "@things-factory/marketplace-base": "^4.3.143",
-    "@things-factory/notification": "^4.3.142",
-    "@things-factory/sales-base": "^4.3.143",
-    "@things-factory/setting-base": "^4.3.142",
-    "@things-factory/shell": "^4.3.142",
-    "@things-factory/transport-base": "^4.3.142",
-    "@things-factory/warehouse-base": "^4.3.143"
+    "@things-factory/auth-base": "^4.3.146",
+    "@things-factory/biz-base": "^4.3.146",
+    "@things-factory/document-template-base": "^4.3.146",
+    "@things-factory/id-rule-base": "^4.3.146",
+    "@things-factory/integration-accounting": "^4.3.146",
+    "@things-factory/integration-lmd": "^4.3.146",
+    "@things-factory/integration-marketplace": "^4.3.146",
+    "@things-factory/integration-sellercraft": "^4.3.146",
+    "@things-factory/integration-sftp": "^4.3.146",
+    "@things-factory/marketplace-base": "^4.3.146",
+    "@things-factory/notification": "^4.3.146",
+    "@things-factory/sales-base": "^4.3.146",
+    "@things-factory/setting-base": "^4.3.146",
+    "@things-factory/shell": "^4.3.146",
+    "@things-factory/transport-base": "^4.3.146",
+    "@things-factory/warehouse-base": "^4.3.146"
   },
-  "gitHead": "39bda16b5928006921a99bbfcbf820f0fcd9e2c1"
+  "gitHead": "919fc314fca9647235fb02b8837e5c42813455bb"
 }

package/server/controllers/ecommerce/ecommerce-controller.ts

@@ -6,7 +6,7 @@ import {
   MarketplaceOrderShippingItem,
   MarketplaceProductVariation
 } from '@things-factory/marketplace-base'
-import { ReleaseGood } from '@things-factory/sales-base'
+import { ORDER_STATUS, OrderNoGenerator, OrderPackage, OrderPackageItem, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { getProductBundleInventory, Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
@@ -212,4 +212,55 @@ export class EcommerceController extends WorksheetController {
       status: marketplaceOrder.status
     })
   }
+
+  async createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood) {
+    let marketplaceOrderShipping: MarketplaceOrderShipping
+    if (marketplaceOrder.isSplitted) {
+      marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
+        where: { domain: companyDomain, marketplaceStore, subOrderNoRef: releaseGood.refNo2 }
+      })
+    } else {
+      marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
+        where: { domain: companyDomain, marketplaceStore, orderNoRef: releaseGood.refNo }
+      })
+    }
+
+    const trackingNo: string = marketplaceOrderShipping.ownTrackingNo
+      ? marketplaceOrderShipping.ownTrackingNo
+      : marketplaceOrderShipping.trackingNo
+    const shippingProvider: string = marketplaceOrderShipping.ownTransporter
+      ? marketplaceOrderShipping.ownTransporter
+      : marketplaceOrderShipping.transporter
+
+    const orderPackage: OrderPackage = {
+      name: OrderNoGenerator.orderPackage(),
+      packageId: null,
+      trackingNo,
+      transporter: shippingProvider,
+      airwayBill: marketplaceOrderShipping.airwayBill,
+      status: ORDER_STATUS.PROCESSING,
+      releaseGood,
+      domain: releaseGood.domain,
+      bizplace: releaseGood.bizplace,
+      creator: releaseGood.creator,
+      updater: releaseGood.updater
+    }
+
+    let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
+    const orderPackageItems: OrderPackageItem[] = releaseGood.orderProducts.map(op => {
+      return {
+        name: OrderNoGenerator.orderPackageItem(),
+        orderProduct: op,
+        status: ORDER_STATUS.PROCESSING,
+        releaseQty: op.releaseQty,
+        orderPackage: savedOrderPackage,
+        domain: releaseGood.domain,
+        bizplace: releaseGood.bizplace,
+        creator: releaseGood.creator,
+        updater: releaseGood.updater
+      }
+    })
+
+    await tx.getRepository(OrderPackageItem).save(orderPackageItems)
+  }
 }

package/server/controllers/ecommerce/sellercraft-controller.ts

@@ -3,7 +3,11 @@ import { Sellercraft, SellercraftAPI } from '@things-factory/integration-sellerc
 import { Product, ProductDetail } from '@things-factory/product-base'
 import {
   ArrivalNotice,
+  ORDER_STATUS,
   OrderInventory,
+  OrderNoGenerator,
+  OrderPackage,
+  OrderPackageItem,
   OrderProduct,
   PurchaseOrder,
   ReleaseGood,
@@ -38,13 +42,55 @@ export class SellercraftController extends WorksheetController {
         orderId: releaseGood.refNo2,
         sellercraftOPs
       }
-      const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
+      const orderPack: any = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
         ...orderInformation,
         context: { state: { domain: this?.domain, user: this?.user } }
       })
 
-      releaseGood.packageId = packageId
-      releaseGood.updater = this.user
+      if (orderPack?.packages) {
+        const packages: any[] = orderPack.packages
+
+        await this.trxMgr
+          .getRepository(ReleaseGood)
+          .update({ id: releaseGood.id }, { packageId: packages[0].packageId, updatedAt: new Date() })
+
+        await Promise.all(
+          packages.map(async pkg => {
+            const items = pkg.items
+            const orderPackage: OrderPackage = {
+              name: OrderNoGenerator.orderPackage(),
+              packageId: pkg.packageId,
+              status: ORDER_STATUS.PROCESSING,
+              releaseGood,
+              domain: releaseGood.domain,
+              bizplace: releaseGood.bizplace,
+              creator: releaseGood.creator,
+              updater: releaseGood.updater
+            }
+
+            let savedOrderPackage: OrderPackage = await this.trxMgr.getRepository(OrderPackage).save(orderPackage)
+
+            const orderPackageItems: OrderPackageItem[] = items.map(itm => {
+              const { sku, qty } = itm
+              const matchedOrderProduct: OrderProduct = orderProducts.find(op => op.product.sku == sku)
+
+              return {
+                name: OrderNoGenerator.orderPackageItem(),
+                orderProduct: matchedOrderProduct,
+                status: ORDER_STATUS.PROCESSING,
+                releaseQty: qty,
+                orderPackage: savedOrderPackage,
+                domain: releaseGood.domain,
+                bizplace: releaseGood.bizplace,
+                creator: releaseGood.creator,
+                updater: releaseGood.updater
+              }
+            })
+
+            await this.trxMgr.getRepository(OrderPackageItem).save(orderPackageItems)
+          })
+        )
+      }
     }
 
     return releaseGood
@@ -268,18 +314,28 @@ export class SellercraftController extends WorksheetController {
         : false
 
     if (!disableInitiateOrderShipment) {
-      if (!releaseGood?.packageId) throw new Error('Order package id is not found')
+      let orderPackages: OrderPackage[] = await this.trxMgr
+        .getRepository(OrderPackage)
+        .find({ where: { releaseGood, bizplace: releaseGood.bizplace } })
+
+      if (orderPackages?.length) {
+        await Promise.all(
+          orderPackages.map(async op => {
+            if (!op?.packageId) throw new Error('Order package id is not found')
+
+            const orderInformation: any = {
+              accountId: sellercraft.accountId,
+              orderId: releaseGood.refNo2,
+              packageId: op.packageId
+            }
 
-      const orderInformation: any = {
-        accountId: sellercraft.accountId,
-        orderId: releaseGood.refNo2,
-        packageId: releaseGood.packageId
+            await SellercraftAPI.initiateOrderShipment(sellercraft, {
+              ...orderInformation,
+              context: { state: { domain: this?.domain, user: this?.user } }
+            })
+          })
+        )
       }
-
-      await SellercraftAPI.initiateOrderShipment(sellercraft, {
-        ...orderInformation,
-        context: { state: { domain: this?.domain, user: this?.user } }
-      })
     }
   }
 
@@ -310,46 +366,63 @@ export class SellercraftController extends WorksheetController {
     try {
       let sellercraftSetting: any = sellercraft.sellercraftSetting
       let disableFetchOrderDocument: boolean =
-        sellercraftSetting?.disableFetchOrderDocument && sellercraftSetting?.disableFetchOrderDocument == 1 ? true : false
+        sellercraftSetting?.disableFetchOrderDocument && sellercraftSetting?.disableFetchOrderDocument == 1
+          ? true
+          : false
 
       if (!disableFetchOrderDocument) {
-        const orderInformation: any = {
-          accountId: sellercraft.accountId,
-          orderId: releaseGood.refNo2,
-          packageId: releaseGood.packageId
+        let orderPackages: OrderPackage[] = await this.trxMgr
+          .getRepository(OrderPackage)
+          .find({ where: { releaseGood, bizplace: releaseGood.bizplace } })
+
+        if (orderPackages?.length) {
+          await Promise.all(
+            orderPackages.map(async op => {
+              if (!op?.packageId) throw new Error('Order package id is not found')
+
+              const orderInformation: any = {
+                accountId: sellercraft.accountId,
+                orderId: releaseGood.refNo2,
+                packageId: op.packageId
+              }
+
+              const {
+                documents,
+                trackingNo,
+                transporter
+              }: { documents: any[]; trackingNo: string; transporter: string } =
+                await SellercraftAPI.fetchOrderDocument(sellercraft, {
+                  ...orderInformation,
+                  context: { state: { domain: this?.domain, user: this?.user } }
+                })
+
+              let updateInfo: any
+              if (documents?.length) {
+                documents.map(document => {
+                  if (document.type === 'invoice') {
+                    updateInfo = { ...updateInfo, invoice: document.download_url }
+                  } else if (document.type === 'airway_bill') {
+                    updateInfo = { ...updateInfo, airwayBill: document.download_url }
+                  }
+                })
+
+                updateInfo = {
+                  ...updateInfo,
+                  trackingNo: trackingNo,
+                  transporter: transporter,
+                  updater: this.user
+                }
+
+                await this.trxMgr.getRepository(OrderPackage).update({ id: op.id }, { ...updateInfo })
+              }
+            })
+          )
         }
-        const { documents, trackingNo, transporter }: { documents: any[]; trackingNo: string; transporter: string } =
-          await SellercraftAPI.fetchOrderDocument(sellercraft, {
-            ...orderInformation,
-            context: { state: { domain: this?.domain, user: this?.user } }
-          })
 
-        let updateInfo: any
-        if (documents?.length) {
-          documents.map(document => {
-            if (document.type === 'invoice') {
-              updateInfo = { ...updateInfo, invoice: document.download_url }
-            } else if (document.type === 'airway_bill') {
-              updateInfo = { ...updateInfo, airwayBill: document.download_url }
-            }
-          })
-
-          updateInfo = {
-            ...updateInfo,
-            trackingNo: trackingNo,
-            transporter: transporter,
-            updater: this.user
-          }
-
-          // releaseGood = await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
-
-          await this.trxMgr.getRepository(ReleaseGood).update({ id: releaseGood.id }, { ...updateInfo })
-          releaseGood = await this.trxMgr.getRepository(ReleaseGood).findOne({ id: releaseGood.id })
-        }
+        releaseGood = await this.trxMgr.getRepository(ReleaseGood).findOne({ id: releaseGood.id })
       }
 
       return releaseGood
-
     } catch (error) {
       throw error
     }