@things-factory/worksheet-base 4.3.77 → 4.3.79-alpha.1

package/server/controllers/worksheet-controller.ts

@@ -1,4 +1,4 @@
-import { EntityManager, EntitySchema, Equal, FindOneOptions, In, Not } from 'typeorm'
+import { EntityManager, EntitySchema, Equal, FindOneOptions, In, Not, getRepository } from 'typeorm'
 
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
@@ -19,11 +19,11 @@ import {
   VasOrder
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet, generateInventoryHistory } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
-import { generateInventoryHistory, WorksheetNoGenerator } from '../utils'
+import { WorksheetNoGenerator } from '../utils'
 
 export type ReferenceOrderType = ArrivalNotice | ReleaseGood | VasOrder | InventoryCheck | DeliveryOrder | ReturnOrder
 export type OrderTargetTypes = OrderProduct | OrderInventory | OrderVas
@@ -489,7 +489,11 @@ export class WorksheetController {
    * @description
    * Update reference order like (ArrivalNotice, ReleaseGood, VasOrder, InventoryCheck)
    */
-  async updateRefOrder(refOrder: ReferenceOrderType, entitySchema?: EntitySchema): Promise<any> {
+  async updateRefOrder(
+    refOrder: ReferenceOrderType,
+    entitySchema?: EntitySchema,
+    currentStatus?: string
+  ): Promise<any> {
     if (!entitySchema) {
       if (refOrder instanceof ArrivalNotice) {
         entitySchema = ArrivalNotice
@@ -507,6 +511,25 @@ export class WorksheetController {
     if (!refOrder.id) throw new Error(this.ERROR_MSG.UPDATE.ID_NOT_EXISTS)
     if (!refOrder.updater?.id) refOrder = this.setStamp(refOrder)
 
+    if (currentStatus && entitySchema == ReleaseGood) {
+
+      let res = await getRepository(entitySchema).query(
+        `
+        update release_goods
+        set status = $1
+        where id = $2
+        and status = $3
+        returning id
+      `,
+        [refOrder.status, refOrder.id, currentStatus]
+      )
+
+      if (res[1] == 0) {
+        this.trxMgr.queryRunner.rollbackTransaction()
+        throw new Error('Worksheet has already been created')
+      }
+    }
+
     return await this.trxMgr.getRepository(entitySchema).save(refOrder)
   }
 
@@ -984,11 +1007,9 @@ export class WorksheetController {
   async getChildQty(
     productDetails: ProductDetail[],
     productBarcode: string,
-    orderProductDetail: ProductDetail
+    orderProductDetail: ProductDetail,
+    scannedProductDetail: ProductDetail
   ): Promise<number> {
-    const scannedProductDetail: ProductDetail = productDetails.find(
-      (productDetail: ProductDetail) => productDetail.gtin === productBarcode
-    )
     let hasChildRelation: boolean = Boolean(scannedProductDetail?.childProductDetail)
     let hasMatchingChild: boolean
     let childQty: number

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

@@ -32,6 +32,7 @@ export const batchPickingWorksheetResolver = {
       .addSelect('"PROD".name', 'productName')
       .addSelect('"PROD".sku', 'productSku')
       .addSelect('"PROD".description', 'productDescription')
+      .addSelect('"PROD_DET".id', 'productDetailId')
       .addSelect('"INV".qty', 'qty')
       .addSelect('"INV".packing_type', 'packingType')
       .addSelect('"INV".packing_size', 'packingSize')
@@ -47,6 +48,7 @@ export const batchPickingWorksheetResolver = {
       .leftJoin('WSD.targetInventory', 'T_INV')
       .leftJoin('T_INV.inventory', 'INV')
       .leftJoin('T_INV.product', 'PROD')
+      .leftJoin('T_INV.productDetail', 'PROD_DET')
       .leftJoin('T_INV.binLocation', 'BIN_LOC')
       .leftJoin('INV.location', 'LOC')
       .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
@@ -64,6 +66,7 @@ export const batchPickingWorksheetResolver = {
       .addGroupBy('"PROD".name')
       .addGroupBy('"PROD".sku')
       .addGroupBy('"PROD".description')
+      .addGroupBy('"PROD_DET".id')
       .addGroupBy('"T_INV".batch_id')
       .addGroupBy('"T_INV".packing_type')
       .addGroupBy('BIN_LOC.name')
@@ -126,6 +129,9 @@ export const batchPickingWorksheetResolver = {
               name: item?.productName,
               description: item?.productDescription,
               sku: item?.productSku
+            },
+            productDetail: {
+              id: item?.productDetailId
             }
           }
         }

package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts

@@ -11,10 +11,9 @@ import {
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
 
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { generateInventoryHistory } from '../../../utils'
 
 export const confirmCancellationReleaseOrder = {
   async confirmCancellationReleaseOrder(_: any, { name }, context: any) {

package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts

@@ -4,12 +4,12 @@ import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { InventoryCheck, ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { generateInventoryHistory, switchLocationStatus } from '../../../utils'
+import { switchLocationStatus } from '../../../utils'
 
 export const cycleCountAdjustmentResolver = {
   async cycleCountAdjustment(_: any, { cycleCountNo }, context: any) {

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts

@@ -1,21 +1,17 @@
 import { EntityManager, getManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
-import { PickingWorksheetController } from '../../../../controllers/'
-import { Worksheet, WorksheetDetail } from '../../../../entities'
-
 import { generatePickingWorksheet } from './generate-release-good-worksheet'
 
 export const generateMultipleReleaseGoodWorksheetResolver = {
-  async generateMultipleReleaseGoodWorksheet(_: any, { releaseGoodNos }, context: any) {
+  async generateMultipleReleaseGoodWorksheet(_: any, { releaseGoods }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
 
-    for (let idx = 0; idx < releaseGoodNos.length; idx++) {
+    for (let idx = 0; idx < releaseGoods.length; idx++) {
       await getManager().transaction(async txMgr => {
-        await generatePickingWorksheet(txMgr, domain, user, releaseGoodNos[idx])
+        await generatePickingWorksheet(txMgr, domain, user, releaseGoods[idx].name, releaseGoods[idx].status)
       });
     }
 

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts

@@ -11,9 +11,9 @@ import { Worksheet, WorksheetDetail } from '../../../../entities'
 import { Inventory, InventoryUtil, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
 
 export const generateReleaseGoodWorksheetResolver = {
-  async generateReleaseGoodWorksheet(_: any, { releaseGoodNo }, context: any) {
+  async generateReleaseGoodWorksheet(_: any, { releaseGoodNo, currentStatus = null }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    return await generatePickingWorksheet(tx, domain, user, releaseGoodNo)
+    return await generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus)
   }
 }
 
@@ -21,7 +21,8 @@ export async function generatePickingWorksheet(
   tx: EntityManager,
   domain: Domain,
   user: User,
-  releaseGoodNo: string
+  releaseGoodNo: string,
+  currentStatus: string = null
 ): Promise<Worksheet> {
   try {
     const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
@@ -78,7 +79,7 @@ export async function generatePickingWorksheet(
 
       await tx.getRepository(ReleaseGood).update({ id: releaseGood.id }, { status: ORDER_STATUS.DONE })
     } else {
-      worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo)
+      worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo, currentStatus)
     }
 
     return worksheet

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -40,6 +40,7 @@ export const inventoriesByPalletResolver = {
     qb.leftJoinAndSelect('iv.domain', 'domain')
       .leftJoinAndSelect('iv.bizplace', 'bizplace')
       .leftJoinAndSelect('iv.product', 'product')
+      .leftJoinAndSelect('iv.productDetail', 'productDetail')
       .leftJoinAndSelect('iv.warehouse', 'warehouse')
       .leftJoinAndSelect('iv.location', 'location')
       .leftJoinAndSelect('iv.creator', 'creator')
@@ -134,7 +135,8 @@ export const inventoriesByPalletResolver = {
           productName: item.product.name,
           productSKU: item.product.sku,
           productBrand: item.product.brand,
-          productId: item.product.id
+          productId: item.product.id,
+          productDetailId: item.productDetail.id
         }
       })
     )

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

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, Company } from '@things-factory/biz-base'
 import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
@@ -58,42 +58,86 @@ export async function completeLoading(
   const warehouseCompanyBizplaces: Bizplace[] = warehouseBizplaces.filter(biz => biz.domain.extType == 'company')
   const warehouseCompanyDomain: Domain = warehouseCompanyBizplaces[0].domain
 
-  const customerDomain: Domain = releaseGood.bizplace.domain
-  const fulfillmentCenter: FulfillmentCenter = await tx
-    .getRepository(FulfillmentCenter)
-    .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
-
-  if (fulfillmentCenter) {
-    let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-      where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
-    })
-    if (customerAvailableSftp) {
-      const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
-
-      let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
-        where: { domain, outboundOrderId: releaseGood.id }
-      })
-
-      // if (responseFileTypes.enableShipment) {
-      //   let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
-      //     releaseGood,
-      //     orderInventories: targetInventories,
-      //     sftp: customerAvailableSftp
-      //   })
-      //   customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
-      // }
-
-      if (responseFileTypes.enableSerialNumber) {
-        let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
-          releaseGood,
-          inventoryItems,
-          sftp: customerAvailableSftp
+  const orderSource: string = releaseGood.source
+  switch (orderSource) {
+    case ApplicationType.SFTP:
+      const customerDomain: Domain = releaseGood.bizplace.domain
+      const fulfillmentCenter: FulfillmentCenter = await tx
+        .getRepository(FulfillmentCenter)
+        .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
+
+      if (fulfillmentCenter) {
+        let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
+          where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
         })
-        customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
+        if (customerAvailableSftp) {
+          const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
+
+          let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
+            where: { domain, outboundOrderId: releaseGood.id }
+          })
+
+          // if (responseFileTypes.enableShipment) {
+          //   let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
+          //     releaseGood,
+          //     orderInventories: targetInventories,
+          //     sftp: customerAvailableSftp
+          //   })
+          //   customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
+          // }
+
+          if (responseFileTypes.enableSerialNumber) {
+            let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
+              releaseGood,
+              inventoryItems,
+              sftp: customerAvailableSftp
+            })
+            customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
+          }
+        }
       }
-    }
+      break
+
+    default:
+      break
   }
 
+  // const customerDomain: Domain = releaseGood.bizplace.domain
+  // const fulfillmentCenter: FulfillmentCenter = await tx
+  //   .getRepository(FulfillmentCenter)
+  //   .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
+
+  // if (fulfillmentCenter) {
+  //   let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
+  //     where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
+  //   })
+  //   if (customerAvailableSftp) {
+  //     const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
+
+  //     let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
+  //       where: { domain, outboundOrderId: releaseGood.id }
+  //     })
+
+  //     // if (responseFileTypes.enableShipment) {
+  //     //   let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
+  //     //     releaseGood,
+  //     //     orderInventories: targetInventories,
+  //     //     sftp: customerAvailableSftp
+  //     //   })
+  //     //   customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
+  //     // }
+
+  //     if (responseFileTypes.enableSerialNumber) {
+  //       let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
+  //         releaseGood,
+  //         inventoryItems,
+  //         sftp: customerAvailableSftp
+  //       })
+  //       customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
+  //     }
+  //   }
+  // }
+
   await worksheetController.completeLoading(releaseGoodNo)
 
   if (remainInventories.length) {

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

@@ -1,6 +1,6 @@
 import { EntityManager, getManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, 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'
@@ -38,15 +38,32 @@ export async function activatePacking(
   const worksheet = await worksheetController.activatePacking(worksheetNo)
   let releaseGood: ReleaseGood = worksheet.releaseGood
 
-  if (releaseGood.type == 'b2c') {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+  const orderSource: string = releaseGood.source
+  switch (orderSource) {
+    case ApplicationType.SELLERCRAFT:
+      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)
-      sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
-    }
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+      }
+      break
+
+    default:
+      break
   }
+
+  // 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)
+  //     sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+  //   }
+  // }
   return worksheet
 }

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

@@ -1,9 +1,8 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -29,12 +28,9 @@ export const completePackingResolver = {
       ]
     })
 
-    if (releaseGood.type === 'b2c') {
-      const sellercraft: Sellercraft = await tx
-        .getRepository(Sellercraft)
-        .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-      if (!sellercraft) {
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.MMS:
         const companyDomain: Domain = releaseGood.bizplace.company.domain
         const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
           where: { orderNo: releaseGood.refNo, domain: companyDomain },
@@ -52,9 +48,38 @@ export const completePackingResolver = {
           const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
           await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
         }
-      }
+        break
+
+      default:
+        break
     }
 
+    // if (releaseGood.type === 'b2c') {
+    //   const sellercraft: Sellercraft = await tx
+    //     .getRepository(Sellercraft)
+    //     .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+    //   if (!sellercraft) {
+    //     const companyDomain: Domain = releaseGood.bizplace.company.domain
+    //     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+    //       where: { orderNo: releaseGood.refNo, domain: companyDomain },
+    //       relations: [
+    //         'marketplaceOrderItems',
+    //         'marketplaceOrderItems.marketplaceOrderShippingItems',
+    //         'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+    //         'marketplaceStore',
+    //         'marketplaceStore.marketplaceDistributors'
+    //       ]
+    //     })
+    //     const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+
+    //     if (marketplaceStore.isAutoUpdateShipment) {
+    //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+    //       await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
+    //     }
+    //   }
+    // }
+
     const bizplace: Bizplace = await getMyBizplace(domain, user)
     const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)
     await worksheetController.notifyToCustomer(bizplace, {

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

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, 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'
@@ -29,14 +29,31 @@ export async function packing(
   let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
   const worksheet: Worksheet = worksheetDetail.worksheet
 
-  if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+  const orderSource: string = releaseGood.source
+  switch (orderSource) {
+    case ApplicationType.SELLERCRAFT:
+      const sellercraft: Sellercraft = await tx
+        .getRepository(Sellercraft)
+        .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-    }
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+      }
+      break
+
+    default:
+      break
   }
+
+  // if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
+  //   const sellercraft: Sellercraft = await tx
+  //     .getRepository(Sellercraft)
+  //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+  //   if (sellercraft) {
+  //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+  //     await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+  //   }
+  // }
 }

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

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, 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'
@@ -34,17 +34,36 @@ export async function scanProductPacking(
     let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
     const worksheet: Worksheet = worksheetDetail.worksheet
 
-    if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
-      const sellercraft: Sellercraft = await tx
-        .getRepository(Sellercraft)
-        .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        if (!releaseGood?.airwayBill) {
+          const sellercraft: Sellercraft = await tx
+            .getRepository(Sellercraft)
+            .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-      if (sellercraft) {
-        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-      }
+          if (sellercraft) {
+            const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+            sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+          }
+        }
+
+        break
+
+      default:
+        break
     }
 
+    // if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
+    //   const sellercraft: Sellercraft = await tx
+    //     .getRepository(Sellercraft)
+    //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+    //   if (sellercraft) {
+    //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+    //     sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+    //   }
+    // }
   } catch (error) {
     throw error
   }