@things-factory/operato-hub 4.3.185 → 4.3.187

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.185",
+  "version": "4.3.187",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -62,7 +62,7 @@
     "@things-factory/auth-ui": "^4.3.179",
     "@things-factory/biz-base": "^4.3.179",
     "@things-factory/biz-ui": "^4.3.179",
-    "@things-factory/board-service": "^4.3.179",
+    "@things-factory/board-service": "^4.3.186",
     "@things-factory/board-ui": "^4.3.179",
     "@things-factory/code-ui": "^4.3.179",
     "@things-factory/component-ui": "^4.3.159",
@@ -71,26 +71,26 @@
     "@things-factory/export-ui": "^4.3.179",
     "@things-factory/export-ui-csv": "^4.3.179",
     "@things-factory/export-ui-excel": "^4.3.179",
-    "@things-factory/geography": "^4.3.179",
+    "@things-factory/geography": "^4.3.186",
     "@things-factory/grist-ui": "^4.3.179",
     "@things-factory/help": "^4.3.179",
     "@things-factory/i18n-base": "^4.3.179",
     "@things-factory/import-ui": "^4.3.179",
     "@things-factory/import-ui-excel": "^4.3.179",
-    "@things-factory/integration-accounting": "^4.3.179",
-    "@things-factory/integration-fulfillment": "^4.3.179",
-    "@things-factory/integration-lmd": "^4.3.179",
-    "@things-factory/integration-marketplace": "^4.3.179",
-    "@things-factory/integration-pos": "^4.3.179",
-    "@things-factory/integration-sellercraft": "^4.3.179",
-    "@things-factory/integration-sftp": "^4.3.179",
-    "@things-factory/lite-menu": "^4.3.179",
+    "@things-factory/integration-accounting": "^4.3.186",
+    "@things-factory/integration-fulfillment": "^4.3.186",
+    "@things-factory/integration-lmd": "^4.3.186",
+    "@things-factory/integration-marketplace": "^4.3.186",
+    "@things-factory/integration-pos": "^4.3.186",
+    "@things-factory/integration-sellercraft": "^4.3.186",
+    "@things-factory/integration-sftp": "^4.3.186",
+    "@things-factory/lite-menu": "^4.3.186",
     "@things-factory/more-ui": "^4.3.179",
-    "@things-factory/notification": "^4.3.179",
+    "@things-factory/notification": "^4.3.186",
     "@things-factory/pdf": "^4.3.159",
-    "@things-factory/product-ui": "^4.3.179",
+    "@things-factory/product-ui": "^4.3.187",
     "@things-factory/resource-ui": "^4.3.179",
-    "@things-factory/sales-base": "^4.3.184",
+    "@things-factory/sales-base": "^4.3.187",
     "@things-factory/scene-data-transform": "^4.3.159",
     "@things-factory/scene-excel": "^4.3.159",
     "@things-factory/scene-firebase": "^4.3.159",
@@ -102,11 +102,11 @@
     "@things-factory/scene-mqtt": "^4.3.179",
     "@things-factory/scene-restful": "^4.3.159",
     "@things-factory/scene-visualizer": "^4.3.159",
-    "@things-factory/setting-ui": "^4.3.179",
+    "@things-factory/setting-ui": "^4.3.186",
     "@things-factory/shell": "^4.3.179",
     "@things-factory/system-ui": "^4.3.179",
-    "@things-factory/warehouse-base": "^4.3.183",
-    "@things-factory/worksheet-base": "^4.3.185",
+    "@things-factory/warehouse-base": "^4.3.187",
+    "@things-factory/worksheet-base": "^4.3.187",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -118,5 +118,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "c7cd806b0057f8c112417716216dc7a740fb0431"
+  "gitHead": "a6192bef4662aafeb4e9d4e715dca07aa1459b2d"
 }

package/server/graphql/resolvers/synchronization/get-lmd-awb.ts

@@ -0,0 +1,178 @@
+import { getRepository, getConnection, Not, In, IsNull, SelectQueryBuilder, EntityManager } from 'typeorm'
+import { v4 as uuidv4 } from 'uuid'
+
+import { ReleaseGood, OrderPackage, ORDER_STATUS } from '@things-factory/sales-base'
+import { LastMileAPI } from '@things-factory/integration-lmd'
+import { Board } from '@things-factory/board-service'
+import { logger } from '@things-factory/env'
+import { headlessModel, pdf } from '@things-factory/board-service'
+import { uploadAwb } from '@things-factory/attachment-base'
+import { Attachment } from '@things-factory/attachment-base'
+import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import { ApplicationType } from '@things-factory/auth-base'
+import { SellercraftController } from '@things-factory/worksheet-base'
+import { Setting } from '@things-factory/setting-base'
+
+const LMD_BOARDS = {
+  dhl: 'operato-lmd-dhl-awb',
+  airspeed: 'operato-lmd-airspeed-awb'
+}
+
+export const getLmdAwbResolver = {
+  async getLmdAwb(_: any, {}, context: any) {
+    const qb: SelectQueryBuilder<OrderPackage> = 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('rg.lmd_option = true')
+      .andWhere('rg.status NOT IN (:...statuses)', {
+        statuses: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
+      })
+      .andWhere('op.parcel_id IS NOT NULL')
+      .andWhere('op.airway_bill IS NULL')
+
+    const orderPackages: OrderPackage[] = await qb.getMany()
+
+    let releaseOrders: ReleaseGood = []
+
+    for (let orderPackage of orderPackages) {
+      await getConnection().transaction(async tx => {
+        try {
+          let awbRes = await LastMileAPI.getAwb(
+            { ...orderPackage.releaseGood.lastMileDelivery, platform: 'lmdMiddleware' },
+            { parcelId: orderPackage.parcelId }
+          )
+
+          if (awbRes) {
+            await constructAndUploadAwb(orderPackage.releaseGood, orderPackage, awbRes)
+            releaseOrders.push(orderPackage.releaseGood)
+          }
+        } catch (e) {
+          logger.error(e)
+        }
+      })
+    }
+
+    // trigger RTS
+    try {
+      let uniqueReleaseOrders: ReleaseGood = [...new Map(releaseOrders.map(item => [item['id'], item])).values()]
+
+      for (let releaseOrder of uniqueReleaseOrders) {
+        const orderSource: string = releaseOrder.source
+
+        if (orderSource == ApplicationType.SELLERCRAFT) {
+          const sellercraft: Sellercraft = await getRepository(Sellercraft).findOne({
+            domain: releaseOrder.bizplace.domain,
+            status: SellercraftStatus.ACTIVE
+          })
+          if (sellercraft) {
+            await getConnection().transaction(async (tx: EntityManager) => {
+              const sellercraftCtrl: SellercraftController = new SellercraftController(tx, null, null)
+              const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
+                where: { domain: releaseOrder.domain, category: 'id-rule', name: 'rts-trigger-level' }
+              })
+
+              if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
+                await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseOrder)
+              }
+            })
+          }
+        }
+      }
+    } catch (e) {
+      logger.error(`[get-lmd-awb-sof-trigger]: ${e}`)
+    }
+    //
+  }
+}
+
+async function constructAndUploadAwb(releaseOrder, orderPackage, awbRes) {
+  let {
+    shipmentID,
+    deliveryConfirmationNo,
+    deliveryDepotCode,
+    primarySortCode,
+    secondarySortCode,
+    recipient,
+    sender,
+    tracking_no,
+    courier
+  } = awbRes
+
+  let senderFullAddress = `${sender?.address}${sender?.address2 ? ', ' + sender?.address2 : ''}${
+    sender?.district ? ', ' + sender?.district : ''
+  }${sender?.city ? ', ' + sender?.city : ''}${sender?.postcode ? ', ' + sender?.postcode : ''}${
+    sender?.state ? ', ' + sender?.state : ''
+  }`
+
+  let recipientAddress1 = `${recipient?.address}${recipient?.address2 ? ', ' + recipient?.address2 : ''}${
+    recipient?.district ? ', ' + recipient?.district : ''
+  }`
+
+  let recipientAddress2 = `${recipient?.state}${recipient?.city ? ', ' + recipient?.city : ''}${
+    recipient?.postcode ? ', ' + recipient?.postcode : ''
+  }`
+
+  let data = {
+    senderFullAddress,
+    senderName: sender?.name,
+    recipientAddress1,
+    recipientAddress2,
+    recipientPhone: recipient?.phone,
+    recipientName: recipient?.name,
+    refId: shipmentID,
+    deliveryConfirmationNo: deliveryConfirmationNo || tracking_no,
+    deliveryDepotCode: deliveryDepotCode,
+    primarySortCode: primarySortCode,
+    secondarySortCode: secondarySortCode,
+    orderNo: releaseOrder?.refNo
+  }
+
+  let lmdBoard: Board = await getRepository(Board).findOne({
+    where: { name: LMD_BOARDS[courier] },
+    relations: ['domain']
+  })
+
+  if (!lmdBoard) throw new Error(`[get-lmd-awb] board is not found (RO: ${releaseOrder.name})`)
+
+  const { model } = await headlessModel({ domain: lmdBoard.domain, id: lmdBoard.id })
+
+  const result = await pdf({
+    id: lmdBoard.id,
+    model,
+    data,
+    options: {
+      format: 'A4'
+    },
+    context: { state: { domain: lmdBoard.domain } }
+  })
+
+  let uuid = uuidv4()
+  let awb = await uploadAwb({
+    content: result,
+    title: uuid
+  })
+
+  if (!awb?.url) throw new Error(`[get-lmd-awb] awb was not uploaded for (RO: ${releaseOrder.name})`)
+
+  await getRepository(OrderPackage).update(
+    { id: orderPackage.id },
+    { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no }
+  )
+
+  // create attachment
+
+  await getRepository(Attachment).insert({
+    name: uuid,
+    mimetype: 'application/pdf',
+    category: 'LMD_AWB',
+    refBy: orderPackage.id,
+    path: awb.url,
+    domain: releaseOrder.domain,
+    size: 0,
+    encoding: ''
+  })
+}

package/server/graphql/resolvers/synchronization/index.ts

@@ -8,6 +8,7 @@ import { syncProductsToAccountResolver } from './sync-products-to-account'
 import { syncProductsToSellercraftResolver } from './sync-products-to-sellercraft'
 import { createDatShipments } from './create-dat-shipments'
 import { autoUpdateAllMarketplaceProductVariationQuantityResolver } from './auto-update-all-marketplace-product-variation-quantity'
+import { getLmdAwbResolver } from './get-lmd-awb'
 
 export const Query = {
   ...fetchSyncProductsResolver,
@@ -22,5 +23,6 @@ export const Mutation = {
   ...syncAllProductsToSellercraftResolver,
   ...sellercraftPackMarketplaceOrderResolver,
   ...createDatShipments,
-  ...autoUpdateAllMarketplaceProductVariationQuantityResolver
+  ...autoUpdateAllMarketplaceProductVariationQuantityResolver,
+  ...getLmdAwbResolver
 }

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

@@ -17,6 +17,7 @@ export const Mutation = /* GraphQL */ `
   syncProductsToAccount(accountId: String!, bizplaceId: String!): Boolean @transaction
   syncAllProductsToSellercraft: Boolean @transaction
   sellercraftPackMarketplaceOrder: Boolean @transaction
+  getLmdAwb: Boolean @transaction
   createDatShipments: Boolean @transaction
   autoUpdateAllMarketplaceProductVariationQuantity(companyDomainId: String, warehouseId: String): Boolean @transaction
   sendEmails: Boolean @transaction

package/server/routers/api/restful-apis/unstable/add-release-order.ts

@@ -1,4 +1,14 @@
-import { EntityManager, getConnection, getRepository, ILike, In, Not, Repository, SelectQueryBuilder } from 'typeorm'
+import {
+  EntityManager,
+  getConnection,
+  getRepository,
+  In,
+  Not,
+  Repository,
+  SelectQueryBuilder,
+  ILike,
+  Brackets
+} from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { restfulApiRouter as router } from '@things-factory/api'
@@ -30,6 +40,7 @@ import {
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
 
 import { ValidationError } from '../../../../errors/index'
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
@@ -116,7 +127,8 @@ router.post(
           paidAmount: bodyReq?.paidAmount,
           discountAmount: bodyReq?.discountAmount,
           taxAmount: bodyReq?.taxAmount,
-          shippingFee: bodyReq?.shippingFee
+          shippingFee: bodyReq?.shippingFee,
+          lmdOption: bodyReq?.lmdOption
         }
 
         // check existing order
@@ -132,6 +144,14 @@ router.post(
             let itemList = await tx.query(
               `
             select wboi.* from warehouse_bizplace_onhand_inventories wboi 
+            left join (
+              select i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom, sum(i2.qty) as storage_qty, sum(i2.uom_value) as storage_uom_value from inventories i2 
+              inner join locations l2 on l2.id = i2.location_id 
+              where i2.domain_id = $1 and i2.bizplace_id = $2
+              and i2.product_id = $3 and i2.packing_type= $4 and i2.packing_size= $5 and i2.uom = $6 and i2.status='STORED'
+              and l2.type='STORAGE' group by i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom
+            ) storageInv on storageInv.product_id = wboi.product_id and storageInv.domain_id=wboi.domain_id and storageInv.bizplace_id=wboi.bizplace_id 
+            and storageInv.packing_type=wboi.packing_type and storageInv.packing_size=wboi.packing_size and storageInv.uom=wboi.uom
             where wboi."domain_id"= $1 and 
             wboi."bizplace_id" = $2 and 
             wboi."group_type" = 'SINGLE' and 
@@ -139,8 +159,8 @@ router.post(
             wboi."packing_type" = $4 and
             wboi."packing_size" = $5 and
             wboi."uom" = $6 and
-            wboi."remain_qty" >= $7 and
-            wboi."remain_uom_value" >= $8
+            (wboi."remain_qty" - wboi."transfer_qty" - coalesce(storageInv.storage_qty, 0)) >= $7 and
+            (wboi."remain_uom_value" - wboi."transfer_uom_value" - coalesce(storageInv.storage_uom_value, 0)) >= $8
           `,
               [
                 domain.id,
@@ -492,6 +512,12 @@ async function createReleaseGood(
         })
       : null
 
+    // assign lmd
+    let lmd: any = null
+    if (releaseGood?.lmdOption) {
+      lmd = await autoAssignLmd(domain, deliveryCountry?.id, releaseGood?.postalCode)
+    }
+
     newReleaseGood = {
       name: roNoSetting
         ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.RO_NUMBER, seed: {} })
@@ -545,6 +571,8 @@ async function createReleaseGood(
       discountAmount: releaseGood?.discountAmount,
       taxAmount: releaseGood?.taxAmount,
       shippingFee: releaseGood?.shippingFee,
+      lmdOption: releaseGood?.lmdOption,
+      lastMileDelivery: lmd,
       creator: user,
       updater: user,
       acceptedBy: user,
@@ -1040,7 +1068,9 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
                 '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
                 UNION
                 (
-                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY ${sortQuery}) as sort_seq, 
+                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${
+                    sortQuery ? ', ' + sortQuery : ''
+                  }) as sort_seq, 
                   iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref, 
                   iv.unit, iv.uom, iv.packing_type, iv.packing_size, 
                   iv.manufacture_year, iv.carton_id, iv.uom_value, 
@@ -1049,11 +1079,12 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
                   FROM "inventories" "iv" 
                   INNER JOIN "locations" "loc" ON "loc"."id"="iv"."location_id" 
                   INNER JOIN "products" "p" ON "p"."id"="iv"."product_id" 
+                  INNER JOIN "warehouse_inventory_assignment_rankings" "wiar" ON "wiar"."location_type"="loc"."type"
                   WHERE case when coalesce("iv"."locked_qty",0) < 0 then 0 else ("iv"."qty" - coalesce("iv"."locked_qty",0)) end > 0 AND 
-                   "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9)
+                   "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9, $10)
                    AND "iv"."obsolete" = false AND case when "iv"."expiration_date" is not null and "p"."shelf_life" is not null then CURRENT_DATE < "iv"."expiration_date" - "p"."shelf_life" else true end
                   ${queryStrings.query.length > 0 ? `AND ${queryStrings.join(' AND ')}` : ''}
-                  ORDER BY ${sortQuery}
+                  ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}
                 )
               ) dt1
             ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0		
@@ -1073,6 +1104,7 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
           INVENTORY_STATUS.STORED,
           LOCATION_TYPE.QUARANTINE,
           LOCATION_TYPE.RESERVE,
+          LOCATION_TYPE.STORAGE,
           ...queryStrings.values
         ]
       )
@@ -1123,3 +1155,33 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
 
   return orderProducts
 }
+
+async function autoAssignLmd(domain, countryId, postalCode) {
+  const qb: SelectQueryBuilder<LastMileDelivery> = getRepository(LastMileDelivery)
+    .createQueryBuilder('lmd')
+    .leftJoinAndSelect('lmd.lastMileDeliverySettings', 'lmds')
+    .innerJoinAndSelect('lmds.geoCountry', 'gc')
+    .where('lmd.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('lower(lmd.status) = :status', { status: 'active' })
+    .andWhere('gc.id = :gcId', { gcId: countryId })
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.include_postal_code = ''`)
+          .orWhere('lmds.include_postal_code is null')
+          .orWhere('lmds.include_postal_code like :includePostCode', { includePostCode: `%${postalCode}%` })
+      })
+    )
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.exclude_postal_code = ''`)
+          .orWhere('lmds.exclude_postal_code is null')
+          .orWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+      })
+    )
+    // .andWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+    .orderBy('lmd.rank')
+
+  const lmdResult: LastMileDelivery = await qb.getOne()
+
+  return lmdResult
+}

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -188,6 +188,7 @@ export const params = {
     'deliverTo.state',
     'deliverTo.phone1',
     'deliverTo.phone2',
+    'deliverTo.email',
     'marketplaceOrderStatus',
     'airwayBill',
     'invoice',
@@ -217,7 +218,8 @@ export const params = {
     'platformName',
     'discountAmount',
     'taxAmount',
-    'shippingFee'
+    'shippingFee',
+    'lmdOption'
   ],
   'cancel-release-order': ['bizplaceId', 'roId', 'orderNo', 'orderNo2', 'orderNo3', 'remark'],
   'update-release-order-details': [

package/server/routers/api/restful-apis/v1/warehouse/add-release-order.ts

@@ -1,9 +1,20 @@
-import { EntityManager, getConnection, getRepository, In, Not, Repository, SelectQueryBuilder, ILike } from 'typeorm'
+import {
+  EntityManager,
+  getConnection,
+  getRepository,
+  In,
+  Not,
+  Repository,
+  SelectQueryBuilder,
+  ILike,
+  Brackets
+} from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
+import { GeoCountry } from '@things-factory/geography'
 import { generateId } from '@things-factory/id-rule-base'
 import { Sellercraft } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
@@ -28,7 +39,7 @@ import {
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
-import { GeoCountry } from '@things-factory/geography'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
@@ -120,6 +131,7 @@ router.post(
           discountAmount: bodyReq?.discountAmount,
           taxAmount: bodyReq?.taxAmount,
           shippingFee: bodyReq?.shippingFee,
+          lmdOption: bodyReq?.lmdOption,
           shippingOrder: {
             shipName: bodyReq?.shippingOrder.shipName,
             containerNo: bodyReq?.shippingOrder.containerNo,
@@ -143,6 +155,14 @@ router.post(
             let itemList = await tx.query(
               `
             select wboi.* from warehouse_bizplace_onhand_inventories wboi 
+            left join (
+              select i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom, sum(i2.qty) as storage_qty, sum(i2.uom_value) as storage_uom_value from inventories i2 
+              inner join locations l2 on l2.id = i2.location_id 
+              where i2.domain_id = $1 and i2.bizplace_id = $2
+              and i2.product_id = $3 and i2.packing_type= $4 and i2.packing_size= $5 and i2.uom = $6 and i2.status='STORED'
+              and l2.type='STORAGE' group by i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom
+            ) storageInv on storageInv.product_id = wboi.product_id and storageInv.domain_id=wboi.domain_id and storageInv.bizplace_id=wboi.bizplace_id 
+            and storageInv.packing_type=wboi.packing_type and storageInv.packing_size=wboi.packing_size and storageInv.uom=wboi.uom
             where wboi."domain_id"= $1 and 
             wboi."bizplace_id" = $2 and 
             wboi."group_type" = 'SINGLE' and 
@@ -150,8 +170,8 @@ router.post(
             wboi."packing_type" = $4 and
             wboi."packing_size" = $5 and
             wboi."uom" = $6 and
-            wboi."remain_qty" >= $7 and
-            wboi."remain_uom_value" >= $8
+            (wboi."remain_qty" - wboi."transfer_qty" - coalesce(storageInv.storage_qty, 0)) >= $7 and
+            (wboi."remain_uom_value" - wboi."transfer_uom_value" - coalesce(storageInv.storage_uom_value, 0)) >= $8
           `,
               [
                 domain.id,
@@ -414,6 +434,12 @@ async function createReleaseGood(
       })
     : null
 
+  // assign lmd
+  let lmd: any = null
+  if (releaseGood?.lmdOption) {
+    lmd = await autoAssignLmd(domain, deliveryCountry?.id, releaseGood?.postalCode)
+  }
+
   newReleaseGood = {
     name: roNoSetting
       ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.RO_NUMBER, seed: {} })
@@ -470,7 +496,9 @@ async function createReleaseGood(
     updater: user,
     acceptedBy: user,
     acceptedAt: new Date(),
-    shippingOrder: shippingOrder ? shippingOrder : null
+    shippingOrder: shippingOrder ? shippingOrder : null,
+    lastMileDelivery: lmd,
+    lmdOption: releaseGood.lmdOption
   }
 
   let resultReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
@@ -910,7 +938,9 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
                 '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
                 UNION
                 (
-                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY ${sortQuery}) as sort_seq, 
+                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${
+                    sortQuery ? ', ' + sortQuery : ''
+                  }) as sort_seq, 
                   iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref, 
                   iv.unit, iv.uom, iv.packing_type, iv.packing_size, 
                   iv.manufacture_year, iv.carton_id, iv.uom_value, 
@@ -919,11 +949,12 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
                   FROM "inventories" "iv" 
                   INNER JOIN "locations" "loc" ON "loc"."id"="iv"."location_id" 
                   INNER JOIN "products" "p" ON "p"."id"="iv"."product_id" 
+                  INNER JOIN "warehouse_inventory_assignment_rankings" "wiar" ON "wiar"."location_type"="loc"."type"
                   WHERE case when coalesce("iv"."locked_qty",0) < 0 then 0 else ("iv"."qty" - coalesce("iv"."locked_qty",0)) end > 0 AND 
-                   "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9)
+                   "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9, $10)
                   AND "iv"."obsolete" = false AND case when "iv"."expiration_date" is not null and "p"."shelf_life" is not null then CURRENT_DATE < "iv"."expiration_date" - "p"."shelf_life" else true end
                   ${queryStrings.query.length > 0 ? `AND ${queryStrings.join(' AND ')}` : ''}
-                  ORDER BY ${sortQuery}
+                  ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}
                 )
               ) dt1
             ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0		
@@ -943,6 +974,7 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
           INVENTORY_STATUS.STORED,
           LOCATION_TYPE.QUARANTINE,
           LOCATION_TYPE.RESERVE,
+          LOCATION_TYPE.STORAGE,
           ...queryStrings.values
         ]
       )
@@ -981,3 +1013,33 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
 
   return orderProducts
 }
+
+async function autoAssignLmd(domain, countryId, postalCode) {
+  const qb: SelectQueryBuilder<LastMileDelivery> = getRepository(LastMileDelivery)
+    .createQueryBuilder('lmd')
+    .leftJoinAndSelect('lmd.lastMileDeliverySettings', 'lmds')
+    .innerJoinAndSelect('lmds.geoCountry', 'gc')
+    .where('lmd.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('lower(lmd.status) = :status', { status: 'active' })
+    .andWhere('gc.id = :gcId', { gcId: countryId })
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.include_postal_code = ''`)
+          .orWhere('lmds.include_postal_code is null')
+          .orWhere('lmds.include_postal_code like :includePostCode', { includePostCode: `%${postalCode}%` })
+      })
+    )
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.exclude_postal_code = ''`)
+          .orWhere('lmds.exclude_postal_code is null')
+          .orWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+      })
+    )
+    // .andWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+    .orderBy('lmd.rank')
+
+  const lmdResult: LastMileDelivery = await qb.getOne()
+
+  return lmdResult
+}

package/server/routers/xilnex-router.ts

@@ -447,6 +447,7 @@ xilnexRouter.post('/webhook-xilnex-transfer-note', async (context, next) => {
                   palletQty: 1,
                   totalUomValue: `${(productDetail.uomValue * item.confirmedQty).toFixed(2)} ${productDetail.uom}`,
                   status: 'PENDING',
+                  refItemId: item.orderItemId,
                   arrivalNotice,
                   domain: warehouseDomain,
                   bizplace: customerBizplace