@things-factory/sales-base 4.3.46 → 4.3.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "4.3.46",
+  "version": "4.3.50",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^4.3.46",
-    "@things-factory/auth-base": "^4.3.46",
-    "@things-factory/biz-base": "^4.3.46",
-    "@things-factory/code-base": "^4.3.46",
-    "@things-factory/integration-sftp": "^4.3.46",
-    "@things-factory/notification": "^4.3.46",
-    "@things-factory/product-base": "^4.3.46",
-    "@things-factory/setting-base": "^4.3.46",
-    "@things-factory/shell": "^4.3.46",
-    "@things-factory/transport-base": "^4.3.46",
-    "@things-factory/warehouse-base": "^4.3.46"
+    "@things-factory/attachment-base": "^4.3.47",
+    "@things-factory/auth-base": "^4.3.47",
+    "@things-factory/biz-base": "^4.3.47",
+    "@things-factory/code-base": "^4.3.47",
+    "@things-factory/integration-sftp": "^4.3.50",
+    "@things-factory/notification": "^4.3.47",
+    "@things-factory/product-base": "^4.3.47",
+    "@things-factory/setting-base": "^4.3.47",
+    "@things-factory/shell": "^4.3.47",
+    "@things-factory/transport-base": "^4.3.47",
+    "@things-factory/warehouse-base": "^4.3.50"
   },
-  "gitHead": "83ecc645c3cc602bdae8941bc10b8f17b7d6c279"
+  "gitHead": "4be34f9fc5e863e89894a44501e6194a3b74c21e"
 }

package/server/constants/order.ts

@@ -45,7 +45,8 @@ export const DISPATCHMENT_STATUS = {
 
 export const MANIFEST_STATUS = {
   OPEN: 'OPEN',
-  CLOSED: 'CLOSED'
+  CLOSED: 'CLOSED',
+  IN_QUEUE: 'IN_QUEUE'
 }
 
 export const ORDER_INVENTORY_TYPE = {

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

@@ -11,134 +11,151 @@ import { OrderController } from '../order-controller'
 
 export class SellercraftController extends OrderController {
   async packOrder(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
-    const orderProducts: OrderProduct[] = releaseGood.orderProducts
-    let sellercraftOPs: any[] = []
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disablePackOrder: boolean =
+      sellercraftSetting?.disablePackOrder && sellercraftSetting?.disablePackOrder == 1 ? true : false
 
-    sellercraftOPs = orderProducts.map(orderProduct => {
-      const product: Product = orderProduct.product
+    if (!disablePackOrder) {
+      const orderProducts: OrderProduct[] = releaseGood.orderProducts
+      let sellercraftOPs: any[] = []
 
-      return {
-        sku: product.sku,
-        releaseQty: orderProduct.releaseQty,
-        uom: 'EA'
+      sellercraftOPs = orderProducts.map(orderProduct => {
+        const product: Product = orderProduct.product
+
+        return {
+          sku: product.sku,
+          releaseQty: orderProduct.releaseQty,
+          uom: 'EA'
+        }
+      })
+
+      const orderInformation: any = {
+        accountId: sellercraft.accountId,
+        orderId: releaseGood.refNo2,
+        sellercraftOPs
       }
-    })
+      const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
+        ...orderInformation,
+        context: { state: { domain: this?.domain, user: this?.user } }
+      })
 
-    const orderInformation: any = {
-      accountId: sellercraft.accountId,
-      orderId: releaseGood.refNo2,
-      sellercraftOPs
+      releaseGood.packageId = packageId
+      releaseGood.updater = this.user
     }
-    const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
-      ...orderInformation,
-      context: { state: { domain: this?.domain, user: this?.user } }
-    })
 
-    releaseGood.packageId = packageId
-    releaseGood.updater = this.user
     return releaseGood
   }
 
   async updateSellercraftStock(sellercraft: Sellercraft, orderProducts: OrderProduct[], type: string): Promise<void> {
-    for (var i = 0; i < orderProducts.length; i++) {
-      const orderProduct: OrderProduct = orderProducts[i]
-
-      const product: Product = orderProduct.product
-      const pendingAssignOPs: OrderProduct[] = await this.trxMgr.getRepository(OrderProduct).find({
-        where: {
-          domain: this.domain,
-          bizplace: orderProduct.bizplace,
-          product,
-          status: ORDER_PRODUCT_STATUS.PENDING_ASSIGN
-        }
-      })
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disableUpdateStock: boolean =
+      sellercraftSetting?.disableUpdateStock && sellercraftSetting?.disableUpdateStock == 1 ? true : false
+
+    if (!disableUpdateStock) {
+      for (var i = 0; i < orderProducts.length; i++) {
+        const orderProduct: OrderProduct = orderProducts[i]
+
+        const product: Product = orderProduct.product
+        const pendingAssignOPs: OrderProduct[] = await this.trxMgr.getRepository(OrderProduct).find({
+          where: {
+            domain: this.domain,
+            bizplace: orderProduct.bizplace,
+            product,
+            status: ORDER_PRODUCT_STATUS.PENDING_ASSIGN
+          }
+        })
 
-      const productDetails: ProductDetail[] = product.productDetails
+        const productDetails: ProductDetail[] = product.productDetails
 
-      let totalUnassignReleaseQty: number = 0
-      if (pendingAssignOPs?.length) {
-        totalUnassignReleaseQty = pendingAssignOPs.reduce((total, currentValue) => {
-          total += currentValue.releaseQty
+        let totalUnassignReleaseQty: number = 0
+        if (pendingAssignOPs?.length) {
+          totalUnassignReleaseQty = pendingAssignOPs.reduce((total, currentValue) => {
+            total += currentValue.releaseQty
+            return total
+          }, 0)
+        }
+
+        let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
+        qb.leftJoinAndSelect('inv.location', 'loc')
+          .andWhere('"inv"."domain_id" = :domainId')
+          .andWhere('"inv"."product_id" = :productId')
+          .andWhere('"inv"."bizplace_id" = :bizplaceId')
+          .andWhere('"inv"."status" = :status')
+          .andWhere('"loc"."type" NOT IN (:...locationTypes)')
+          .setParameters({
+            domainId: this.domain.id,
+            productId: product.id,
+            bizplaceId: orderProduct.bizplace.id,
+            status: INVENTORY_STATUS.STORED,
+            locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+          })
+
+        let inventories: Inventory[] = await qb.getMany()
+
+        let defaultProductDetail: ProductDetail
+        const sellercraftInvs: any[] = await Promise.all(
+          inventories.map(async (inventory: Inventory) => {
+            const inventoryPackingType: string = inventory.packingType
+            defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
+
+            let packingSize: number = 1
+            if (inventoryPackingType !== defaultProductDetail.packingType) {
+              const unmatchingProductDetail: ProductDetail = product.productDetails.find(
+                productDetail => productDetail.packingType === inventoryPackingType
+              )
+
+              packingSize = await this.getChildPackingSize(
+                productDetails,
+                defaultProductDetail,
+                unmatchingProductDetail
+              )
+              if (packingSize == 0) packingSize = 1
+            }
+
+            return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize }
+          })
+        )
+
+        let inventoryTotalQty: number = sellercraftInvs.reduce((total, currentValue) => {
+          total += currentValue.totalQty
           return total
         }, 0)
-      }
 
-      let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
-      qb.leftJoinAndSelect('inv.location', 'loc')
-        .andWhere('"inv"."domain_id" = :domainId')
-        .andWhere('"inv"."product_id" = :productId')
-        .andWhere('"inv"."bizplace_id" = :bizplaceId')
-        .andWhere('"inv"."status" = :status')
-        .andWhere('"loc"."type" NOT IN (:...locationTypes)')
-        .setParameters({
-          domainId: this.domain.id,
-          productId: product.id,
-          bizplaceId: orderProduct.bizplace.id,
-          status: INVENTORY_STATUS.STORED,
-          locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
-        })
-
-      let inventories: Inventory[] = await qb.getMany()
-
-      let defaultProductDetail: ProductDetail
-      const sellercraftInvs: any[] = await Promise.all(
-        inventories.map(async (inventory: Inventory) => {
-          const inventoryPackingType: string = inventory.packingType
-          defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
+        let inventoryTotalLockedQty: number = sellercraftInvs.reduce((total, currentValue) => {
+          total += currentValue.totalLockedQty
+          return total
+        }, 0)
 
-          let packingSize: number = 1
-          if (inventoryPackingType !== defaultProductDetail.packingType) {
-            const unmatchingProductDetail: ProductDetail = product.productDetails.find(
-              productDetail => productDetail.packingType === inventoryPackingType
-            )
+        switch (type) {
+          case 'CONFIRM_ORDER':
+            inventoryTotalQty -= totalUnassignReleaseQty
+            break
+        }
 
-            packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
-            if (packingSize == 0) packingSize = 1
+        const sellercraftInv: any[] = [
+          {
+            sku: product.sku,
+            gtin: defaultProductDetail.gtin,
+            stock: {
+              quantity_total: inventoryTotalQty,
+              quantity_reserved: inventoryTotalLockedQty,
+              unit_of_measure: 'EA'
+            },
+            package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
+            package_dimensions: {
+              length_mm: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
+              width_mm: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
+              height_mm: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+            }
           }
+        ]
 
-          return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize }
+        await SellercraftAPI.updateProduct(sellercraft, {
+          context: { state: { domain: this?.domain, user: this?.user } },
+          accountId: sellercraft.accountId,
+          sellercraftInv
         })
-      )
-
-      let inventoryTotalQty: number = sellercraftInvs.reduce((total, currentValue) => {
-        total += currentValue.totalQty
-        return total
-      }, 0)
-
-      let inventoryTotalLockedQty: number = sellercraftInvs.reduce((total, currentValue) => {
-        total += currentValue.totalLockedQty
-        return total
-      }, 0)
-
-      switch (type) {
-        case 'CONFIRM_ORDER':
-          inventoryTotalQty -= totalUnassignReleaseQty
-          break
       }
-
-      const sellercraftInv: any[] = [
-        {
-          sku: product.sku,
-          gtin: defaultProductDetail.gtin,
-          stock: {
-            quantity_total: inventoryTotalQty,
-            quantity_reserved: inventoryTotalLockedQty,
-            unit_of_measure: 'EA'
-          },
-          package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
-          package_dimensions: {
-            length_mm: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
-            width_mm: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
-            height_mm: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
-          }
-        }
-      ]
-
-      await SellercraftAPI.updateProduct(sellercraft, {
-        context: { state: { domain: this?.domain, user: this?.user } },
-        accountId: sellercraft.accountId,
-        sellercraftInv
-      })
     }
   }
 

package/server/service/arrival-notice/arrival-notice-mutation.ts

@@ -14,7 +14,7 @@ import {
 import { generateId } from '@things-factory/id-rule-base'
 import { sendNotification } from '@things-factory/notification'
 import { Product } from '@things-factory/product-base'
-import { Setting } from '@things-factory/setting-base'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 import {
@@ -66,6 +66,7 @@ export class ArrivalNoticeMutation {
     const createdArrivalNotice: ArrivalNotice = await generateArrivalNoticeFunction(
       null,
       arrivalNotice,
+      false,
       files,
       context,
       tx
@@ -198,7 +199,7 @@ export class ArrivalNoticeMutation {
     @Arg('file', type => GraphQLUpload, { nullable: true }) file?: FileUpload
   ): Promise<ArrivalNotice> {
     const { tx }: { tx: EntityManager } = context.state
-    const createdGAN: ArrivalNotice = await generateArrivalNoticeFunction(null, arrivalNotice, file, context, tx)
+    const createdGAN: ArrivalNotice = await generateArrivalNoticeFunction(null, arrivalNotice, false, file, context, tx)
 
     debug('createdGAN', createdGAN)
 
@@ -235,15 +236,20 @@ export class ArrivalNoticeMutation {
   async bulkGenerateArrivalNotices(
     @Ctx() context: any,
     @Arg('rawArrivalNotices', type => [NewArrivalNotice], { nullable: true }) rawArrivalNotices: NewArrivalNotice[],
-    @Arg('bizplaceId', type => String) bizplaceId: string
+    @Arg('bizplaceId', type => String) bizplaceId: string,
+    @Arg('bufferLocation', type => String, { nullable: true }) bufferLocation: string
   ): Promise<ArrivalNoticeList> {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
     let createdArrivalNoticeIds: string[] = [],
       createdOrderProductIds: string[] = [],
       errorsCaught: any[] = [],
       finalArrivalNoticeList: ArrivalNotice[] = []
+    let opStatus = ORDER_PRODUCT_STATUS.PENDING_RECEIVE
+    let anStatus = ORDER_STATUS.PENDING_RECEIVE
 
-    const foundBizplace: Bizplace = await tx.getRepository(Bizplace).findOne(bizplaceId)
+    const foundBizplace: Bizplace = await tx
+      .getRepository(Bizplace)
+      .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
 
     if (!foundBizplace) throw new Error('company not found')
 
@@ -262,6 +268,27 @@ export class ArrivalNoticeMutation {
       }
     })
 
+    const ganProcessingSetting: Setting = await tx.getRepository(Setting).findOne({
+      where: { domain, category: 'id-rule', name: 'gan-order-processing' }
+    })
+
+    const partnerGanProcessingSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
+      where: { setting: ganProcessingSetting, domain, partnerDomain: foundBizplace.domain.id }
+    })
+
+    // If status of GAN is PENDING_RECEIVE then directly to assign warehouse
+    if (ganProcessingSetting) {
+      let setting = !isNaN(partnerGanProcessingSetting?.value)
+        ? partnerGanProcessingSetting?.value
+        : ganProcessingSetting.value
+
+      // CONFIRM to assign if setting value is 1
+      if (setting == 1) {
+        opStatus = ORDER_PRODUCT_STATUS.ARRIVED
+        anStatus = ORDER_STATUS.ARRIVED
+      }
+    }
+
     // extract rawArrivalNotices data into normal ArrivalNotice format
     let arrivalNotices: Partial<ArrivalNotice[]> = extractArrivalNotices(validatedArrivalNotices)
 
@@ -336,12 +363,12 @@ export class ArrivalNoticeMutation {
         // update arrivalNotices status to PENDING_RECEIVE
         await childTx
           .getRepository(ArrivalNotice)
-          .update({ id: In(createdArrivalNoticeIds) }, { status: ORDER_STATUS.PENDING_RECEIVE, updater: user })
+          .update({ id: In(createdArrivalNoticeIds) }, { status: anStatus, updater: user })
 
         // update orderProducts status to PENDING_RECEIVE
         await childTx
           .getRepository(OrderProduct)
-          .update({ id: In(createdOrderProductIds) }, { status: ORDER_PRODUCT_STATUS.PENDING_RECEIVE, updater: user })
+          .update({ id: In(createdOrderProductIds) }, { status: opStatus, updater: user })
 
         finalArrivalNoticeList = await childTx.getRepository(ArrivalNotice).find({
           where: { id: In(createdArrivalNoticeIds) },
@@ -423,6 +450,7 @@ export async function deleteArrivalNotice(
 export async function generateArrivalNoticeFunction(
   _: any,
   arrivalNotice: any,
+  fromPo: Boolean,
   files: FileUpload[],
   context: any,
   tx?: EntityManager
@@ -474,7 +502,7 @@ export async function generateArrivalNoticeFunction(
     domain,
     bizplace: myBizplace,
     looseItem: arrivalNotice?.looseItem ? arrivalNotice.looseItem : false,
-    status: ORDER_STATUS.PENDING,
+    status: fromPo ? ORDER_STATUS.INTRANSIT : ORDER_STATUS.PENDING,
     creator: user,
     updater: user
   })
@@ -484,7 +512,7 @@ export async function generateArrivalNoticeFunction(
     domain,
     createdArrivalNotice,
     orderProducts.map((op: OrderProduct) => {
-      return { ...op, status: ORDER_PRODUCT_STATUS.PENDING }
+      return { ...op, status: fromPo ? ORDER_PRODUCT_STATUS.INTRANSIT : ORDER_PRODUCT_STATUS.PENDING }
     }),
     user,
     tx
@@ -508,7 +536,7 @@ export async function generateArrivalNoticeFunction(
           vas: await tx.getRepository(Vas).findOne({ domain, id: ov.vas.id }),
           type: ORDER_TYPES.ARRIVAL_NOTICE,
           arrivalNotice: createdArrivalNotice,
-          status: ORDER_VAS_STATUS.PENDING,
+          status: fromPo ? ORDER_VAS_STATUS.INTRANSIT : ORDER_VAS_STATUS.PENDING,
           creator: user,
           updater: user
         }
@@ -542,6 +570,7 @@ export async function confirmArrivalNoticeFunction(
     where: { domain, name, status: ORDER_STATUS.PENDING },
     relations: [
       'bizplace',
+      'bizplace.domain',
       'releaseGood',
       'orderProducts',
       'orderProducts.product',
@@ -555,25 +584,56 @@ export async function confirmArrivalNoticeFunction(
   let foundOPs: OrderProduct[] = foundArrivalNotice.orderProducts
   let foundOVs: OrderVas[] = foundArrivalNotice.orderVass
   let customerBizplace: Bizplace = foundArrivalNotice.bizplace
+  let opStatus = ORDER_PRODUCT_STATUS.PENDING_RECEIVE
+  let anStatus = ORDER_STATUS.PENDING_RECEIVE
+  let ovStatus = ORDER_VAS_STATUS.PENDING_RECEIVE
+  let acceptedByUser = null
+  let acceptedTime = null
+
+  const ganProcessingSetting: Setting = await tx.getRepository(Setting).findOne({
+    where: { domain, category: 'id-rule', name: 'gan-order-processing' }
+  })
+
+  const partnerGanProcessingSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
+    where: { setting: ganProcessingSetting, domain, partnerDomain: customerBizplace?.domain }
+  })
+
+  // If status of GAN is PENDING_RECEIVE then directly to assign warehouse
+  if (ganProcessingSetting) {
+    let setting = !isNaN(partnerGanProcessingSetting?.value)
+      ? partnerGanProcessingSetting?.value
+      : ganProcessingSetting.value
+
+    // CONFIRM to assign if setting value is 1
+    if (setting == 1) {
+      opStatus = ORDER_PRODUCT_STATUS.ARRIVED
+      anStatus = ORDER_STATUS.ARRIVED
+      ovStatus = ORDER_VAS_STATUS.ARRIVED
+      acceptedByUser = user
+      acceptedTime = new Date()
+    }
+  }
 
   if (!foundArrivalNotice) throw new Error(`Arrival notice doesn't exists.`)
 
   // 1. GAN Status change (PENDING => PENDING_RECEIVE)
-  const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).save({
+  let arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).save({
     ...foundArrivalNotice,
-    status: ORDER_STATUS.PENDING_RECEIVE,
-    updater: user
+    status: anStatus,
+    updater: user,
+    acceptedBy: acceptedByUser,
+    acceptedAt: acceptedTime
   })
 
   foundOPs = foundOPs.map((op: OrderProduct) => {
-    return { ...op, status: ORDER_PRODUCT_STATUS.PENDING_RECEIVE }
+    return { ...op, status: opStatus }
   })
   await tx.getRepository(OrderProduct).save(foundOPs)
 
   // 2. Update order vas status if it exists.
   if (foundOVs && foundOVs.length) {
     foundOVs = foundOVs.map((ov: OrderVas) => {
-      return { ...ov, status: ORDER_VAS_STATUS.PENDING_RECEIVE }
+      return { ...ov, status: ovStatus }
     })
 
     await tx.getRepository(OrderVas).save(foundOVs)
@@ -623,22 +683,50 @@ export async function receiveArrivalNoticeFunction(_: any, name: String, context
   try {
     const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
       where: { domain, name, status: ORDER_STATUS.PENDING_RECEIVE },
-      relations: ['bizplace', 'collectionOrders', 'orderProducts', 'orderVass']
+      relations: ['bizplace', 'bizplace.domain', 'collectionOrders', 'orderProducts', 'orderVass']
     })
 
-    if (!foundArrivalNotice) throw new Error(`Arrival notice doesn't exists.`)
-
     let foundOPs: OrderProduct[] = foundArrivalNotice.orderProducts
     let foundOVs: OrderVas[] = foundArrivalNotice.orderVass
     let foundCOs: CollectionOrder[] = await tx.getRepository(CollectionOrder).find({
       where: { domain, refNo: foundArrivalNotice.name }
     })
+    let customerBizplace: Bizplace = foundArrivalNotice.bizplace
+    let opStatus = ORDER_PRODUCT_STATUS.INTRANSIT
+    let anStatus = ORDER_STATUS.INTRANSIT
+    let ovStatus = ORDER_VAS_STATUS.INTRANSIT
+    let coStatus = ORDER_STATUS.READY_TO_DISPATCH
+
+    const ganProcessingSetting: Setting = await tx.getRepository(Setting).findOne({
+      where: { domain, category: 'id-rule', name: 'gan-order-processing' }
+    })
+
+    const partnerGanProcessingSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
+      where: { setting: ganProcessingSetting, domain, partnerDomain: customerBizplace?.domain }
+    })
+
+    // If status of GAN is INTRANSIT then directly to assign warehouse
+    if (ganProcessingSetting) {
+      let setting = !isNaN(partnerGanProcessingSetting?.value)
+        ? partnerGanProcessingSetting?.value
+        : ganProcessingSetting.value
+
+      // RECEIVE to assign if setting value is 2
+      if (setting == 2) {
+        opStatus = ORDER_PRODUCT_STATUS.ARRIVED
+        anStatus = ORDER_STATUS.ARRIVED
+        ovStatus = ORDER_VAS_STATUS.ARRIVED
+        coStatus = ORDER_STATUS.READY_TO_DISPATCH
+      }
+    }
+
+    if (!foundArrivalNotice) throw new Error(`Arrival notice doesn't exists.`)
 
     // 1. Update status of order products (PENDING_RECEIVE => INTRANSIT)
     foundOPs = foundOPs.map((op: OrderProduct) => {
       return {
         ...op,
-        status: ORDER_PRODUCT_STATUS.INTRANSIT,
+        status: opStatus,
         updater: user
       }
     })
@@ -649,7 +737,7 @@ export async function receiveArrivalNoticeFunction(_: any, name: String, context
       foundOVs = foundOVs.map((ov: OrderVas) => {
         return {
           ...ov,
-          status: ORDER_VAS_STATUS.INTRANSIT,
+          status: ovStatus,
           updater: user
         }
       })
@@ -661,7 +749,7 @@ export async function receiveArrivalNoticeFunction(_: any, name: String, context
       foundCOs = foundCOs.map((co: CollectionOrder) => {
         return {
           ...co,
-          status: ORDER_STATUS.READY_TO_DISPATCH,
+          status: coStatus,
           updater: user
         }
       })
@@ -686,9 +774,9 @@ export async function receiveArrivalNoticeFunction(_: any, name: String, context
     }
 
     // 4. Update status of arrival notice (PENDING_RECEIVE => INTRANSIT)
-    await tx.getRepository(ArrivalNotice).save({
+    let rcvArrivalNotice = await tx.getRepository(ArrivalNotice).save({
       ...foundArrivalNotice,
-      status: ORDER_STATUS.INTRANSIT,
+      status: anStatus,
       acceptedBy: user,
       acceptedAt: new Date(),
       updater: user

package/server/service/draft-release-good/draft-release-good.ts

@@ -1,4 +1,4 @@
-import { Field, ID, Float, ObjectType, registerEnumType } from 'type-graphql'
+import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -98,8 +98,8 @@ export class DraftReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: ReleaseOrderType,
     default: ReleaseOrderType.B2B
   })
@@ -233,6 +233,10 @@ export class DraftReleaseGood {
   @Field({ nullable: true })
   email: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  packageId: string
+
   @ManyToOne(type => ContactPoint)
   @Field(type => ContactPoint, { nullable: true })
   deliverTo: ContactPoint