@things-factory/worksheet-base 4.3.185 → 4.3.186

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -2,7 +2,6 @@ import { EntityManager, Equal, getConnection, getManager, In, IsNull, Not } from
 
 import { ApplicationType } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { logger } from '@things-factory/env'
 import { generateId } from '@things-factory/id-rule-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
@@ -40,6 +39,7 @@ import { SellercraftController } from '../../controllers'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import { isInventoryObsolete, WorksheetNoGenerator } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
+import { logger } from '@things-factory/env'
 
 export class PickingWorksheetController extends VasWorksheetController {
   async generatePickingWorksheet(releaseGoodNo: string, currentStatus: string = null): Promise<Worksheet> {
@@ -187,7 +187,13 @@ export class PickingWorksheetController extends VasWorksheetController {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.PICKING, [
       'releaseGood',
       'releaseGood.bizplace',
+      'releaseGood.domain',
+      'releaseGood.lastMileDelivery',
       'releaseGood.bizplace.domain',
+      'releaseGood.orderPackages',
+      'releaseGood.orderPackages.orderPackageItems',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct.product',
       'domain',
       'bizplace',
       'bizplace.domain',
@@ -274,6 +280,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       'worksheetDetails',
       'worksheetDetails.targetInventory',
       'worksheetDetails.targetInventory.releaseGood',
+      'worksheetDetails.targetInventory.releaseGood.domain',
       'worksheetDetails.targetInventory.product',
       'bizplace',
       'bizplace.domain',
@@ -296,12 +303,16 @@ export class PickingWorksheetController extends VasWorksheetController {
     const pickingOrderInventory: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
       where: { domain: this.domain, refWorksheetId: worksheet.id, status: ORDER_STATUS.PICKING },
       relations: [
-        'releaseGood',
-        'releaseGood.domain',
-        'releaseGood.bizplace',
-        'releaseGood.bizplace.domain',
-        'releaseGood.orderPackages'
-      ]
+      'releaseGood',
+      'releaseGood.domain',
+      'releaseGood.lastMileDelivery', 
+      'releaseGood.bizplace',
+      'releaseGood.bizplace.domain',
+      'releaseGood.orderPackages',
+      'releaseGood.orderPackages.orderPackageItems',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct.product'
+    ]
     })
 
     let releaseGoods: ReleaseGood[] = pickingOrderInventory.reduce((data, oi: OrderInventory) => {

package/server/controllers/pos/xilnex-controller.ts

@@ -7,6 +7,7 @@ import {
   DeliveryOrder,
   ORDER_SOURCE_TYPE,
   OrderInventory,
+  OrderProduct,
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Inventory } from '@things-factory/warehouse-base'
@@ -31,14 +32,17 @@ export class XilnexController extends WorksheetController {
         .getRepository(Inventory)
         .createQueryBuilder('iv')
         .select('p.sku', 'productSku')
+        .addSelect('op.ref_item_id', 'refItemId')
         .addSelect('SUM(COALESCE(iv.qty,0))', 'totalQty')
         .addSelect('SUM(COALESCE(iv.unit_cost,0))', 'unitCost')
         .innerJoin('iv.location', 'loc')
         .innerJoin('iv.product', 'p')
+        .leftJoin(OrderProduct, 'op', 'iv.order_product_id::uuid = op.id::uuid')
         .where('"iv"."id" IN (:...inventoryIds)')
         .groupBy('iv.product_id')
         .addGroupBy('p.sku')
         .addGroupBy('iv.batch_id')
+        .addGroupBy('op.ref_item_id')
         .setParameters({
           inventoryIds: inventoryIds
         })
@@ -50,7 +54,8 @@ export class XilnexController extends WorksheetController {
             sku: item.productSku
           },
           actualPackQty: item.totalQty,
-          unitPrice: item.unitCost
+          unitPrice: item.unitCost,
+          refItemId: item.refItemId
         }
       })
 

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

@@ -22,6 +22,7 @@ import {
 } from '@things-factory/warehouse-base'
 
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { LastMileAPI } from '@things-factory/integration-lmd'
 
 export const confirmCancellationReleaseOrder = {
   async confirmCancellationReleaseOrder(_: any, { name }, context: any) {
@@ -35,7 +36,9 @@ export const confirmCancellationReleaseOrder = {
         'orderInventories',
         'orderInventories.inventory',
         'orderInventories.inventory.location',
-        'orderVass'
+        'orderVass',
+        'lastMileDelivery',
+        'orderPackages'
       ]
     })
 
@@ -232,6 +235,24 @@ export const confirmCancellationReleaseOrder = {
       createSalesReturn(account)
     }
 
+    // cancel consignment for lmd orders
+    if (releaseGood?.lmdOption && releaseGood?.lastMileDelivery && releaseGood?.orderPackages) {
+      for (let op of releaseGood.orderPackages) {
+        if (op?.parcelId) {
+          let res = await LastMileAPI.deleteParcel({...releaseGood.lastMileDelivery, platform: 'lmdMiddleware'}, {
+            clientId: releaseGood.lastMileDelivery?.clientId,
+            clientPass: releaseGood.lastMileDelivery?.secretKey,
+            soldToAccountId: releaseGood.lastMileDelivery?.soldToAccountId,
+            pickupAccountId: releaseGood.lastMileDelivery?.pickupAccountId,
+            token: releaseGood.lastMileDelivery?.accessToken,
+            parcelId: op.parcelId,
+            warehouse: domain?.name
+          })
+          if (!res?.status) throw new Error('cannot cancel consignment note')  
+        }
+      }
+    }
+
     return
   }
 }

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

@@ -1,16 +1,28 @@
-import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
+import {
+  Brackets,
+  getRepository,
+  SelectQueryBuilder
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
-import { buildCondition, buildQuery, Domain } from '@things-factory/shell'
-import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
+import {
+  buildCondition,
+  buildQuery,
+  Domain
+} from '@things-factory/shell'
+import {
+  Inventory,
+  LOCATION_TYPE
+} from '@things-factory/warehouse-base'
 
 export const inventoriesByPalletResolver = {
   async inventoriesByPallet(_: any, { filters, pagination, sortings, locationSortingRules }, context: any) {
     const { domain, user }: { domain: Domain; user: User } = context.state
     const params = { filters, pagination }
     let permittedBizplaceIds: string[] = await getPermittedBizplaceIds(domain, user)
+    const bizplaceId =  params.filters.find(x => x.name == 'bizplace_id')
     const productFilters = params.filters.filter(x => x.name == 'productName')
     const recallFilters = params.filters.find(x => x.name === 'recall')
     const skipLockCheckFilters = params.filters.find(x => x.name === 'skipLockCheck')
@@ -18,17 +30,10 @@ export const inventoriesByPalletResolver = {
       skipLockCheckFilters && skipLockCheckFilters?.value ? skipLockCheckFilters?.value : false
     const productFilterColumns = ['sku', 'brandSku', 'name', 'description', 'brand', 'subBrand']
     params.filters = params.filters.filter(x => x.name != 'productName')
+    const batchIdFilters = params.filters.find(x => x.name == 'batchId')
 
-    if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
-      params.filters.push({
-        name: 'bizplace',
-        operator: 'in',
-        value: permittedBizplaceIds,
-        relation: true
-      })
-    } else {
-      permittedBizplaceIds = params.filters.find(filter => filter.name === 'bizplace').value
-      params.filters.find(filter => filter.name === 'bizplace').relation = true
+    if (!params.filters.find((filter: any) => filter.name === 'bizplace_id')) {
+      throw new Error('No Bizplace found')
     }
 
     const locationFilters = params.filters.find(x => x.name == 'locationName')
@@ -63,12 +68,37 @@ export const inventoriesByPalletResolver = {
             oi.product_id = p2.id
           WHERE 
             oi.status = '${ORDER_INVENTORY_STATUS.PENDING_SPLIT}'
-          AND oi.bizplace_id IN (:...permittedBizplaceIds)
           AND oi.domain_id = (:domainId)
+          AND oi.bizplace_id = (:bizplaceId)
         )`,
-        { permittedBizplaceIds, domainId: domain.id }
+        { bizplaceId: bizplaceId.value , domainId: domain.id }
       )
 
+      if (locationFilters) {
+        qb.andWhere
+        (`location.name ilike '${locationFilters.value}'`)
+      }  
+
+      if (productFilters && productFilters.length > 0) {
+        let productInfo = productFilters[0]
+        qb.andWhere(
+          new Brackets(qb2 => {
+            productFilterColumns.forEach(filter => {
+              const condition = buildCondition(
+                'product',
+                filter,
+                'i_like',
+                productInfo.value,
+                false,
+                Object.keys(qb.getParameters()).length
+              )
+  
+              qb2.orWhere(condition.clause, condition.parameters)
+            })
+          })
+        )
+      }
+
     if (!skipLockCheck) {
       qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
       qb.andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
@@ -76,8 +106,39 @@ export const inventoriesByPalletResolver = {
 
     if (recallFilters?.value === true) {
       qb.orWhere(
-        '(iv.obsolete = true or case when iv.expiration_date is not null and product.shelf_life is not null then CURRENT_DATE > iv.expiration_date - product.shelf_life else true end)'
-      )
+        '(iv.domain_id = (:domainId) and iv.bizplace_id = (:bizplaceId)'
+        )
+        if (locationFilters){
+          qb.andWhere
+        (`location.name ilike '${locationFilters.value}'`)
+        }
+        if (productFilters && productFilters.length > 0) {
+          let productInfo = productFilters[0]
+          qb.andWhere(
+            new Brackets(qb2 => {
+              productFilterColumns.forEach(filter => {
+                const condition = buildCondition(
+                  'product',
+                  filter,
+                  'i_like',
+                  productInfo.value,
+                  false,
+                  Object.keys(qb.getParameters()).length
+                )
+    
+                qb2.orWhere(condition.clause, condition.parameters)
+              })
+            })
+          )
+        }
+        if (batchIdFilters) {
+          qb.andWhere(
+            `iv.batch_id ilike '${batchIdFilters.value}'`
+            )
+        }
+      qb.andWhere(
+        'iv.obsolete = true and case when iv.expiration_date is not null and product.shelf_life is not null then CURRENT_DATE > iv.expiration_date - product.shelf_life else true end)'
+        )
     } else {
       qb.andWhere('iv.obsolete = false')
       qb.andWhere(
@@ -85,9 +146,7 @@ export const inventoriesByPalletResolver = {
       )
     }
 
-    if (locationFilters) {
-      qb.andWhere(`location.name ilike '${locationFilters.value}'`)
-    }
+    let [items, total] = await qb.getManyAndCount()
 
     if (sortings?.length !== 0) {
       const arrChildSortData = ['productName', 'productSKU']
@@ -112,27 +171,6 @@ export const inventoriesByPalletResolver = {
       qb.addOrderBy('location.name', 'DESC')
     }
 
-    if (productFilters && productFilters.length > 0) {
-      let productInfo = productFilters[0]
-      qb.andWhere(
-        new Brackets(qb2 => {
-          productFilterColumns.forEach(filter => {
-            const condition = buildCondition(
-              'product',
-              filter,
-              'i_like',
-              productInfo.value,
-              false,
-              Object.keys(qb.getParameters()).length
-            )
-
-            qb2.orWhere(condition.clause, condition.parameters)
-          })
-        })
-      )
-    }
-    let [items, total] = await qb.getManyAndCount()
-
     items = await Promise.all(
       items.map(async (item: Inventory) => {
         const { remainQty, remainUomValue } = await getRemainAmount(item)
@@ -161,4 +199,4 @@ async function getRemainAmount(inventory: Inventory): Promise<{ remainQty: numbe
     remainQty: inventory.qty - (inventory.lockedQty || 0),
     remainUomValue: inventory.uomValue - (inventory.lockedUomValue || 0)
   }
-}
+}

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

@@ -26,6 +26,7 @@ import {
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
+import { createLmdParcel } from '../../../../utils'
 
 export const completeBatchPickingResolver = {
   async completeBatchPicking(_: any, { taskNo }, context: any) {
@@ -81,9 +82,14 @@ export async function completeBatchPicking(
           'domain',
           'creator',
           'updater',
+          'lastMileDelivery',
           'orderPackages',
+          'orderPackages.orderPackageItems',
+          'orderPackages.orderPackageItems.orderProduct',
+          'orderPackages.orderPackageItems.orderProduct.product',
           'orderProducts',
           'orderProducts.product',
+          'orderProducts.productDetail',
           'bizplace',
           'bizplace.company',
           'bizplace.company.domain'
@@ -138,7 +144,7 @@ export async function completeBatchPicking(
           if (marketplaceStore?.isAutoUpdateShipment) {
             await ecommerceCtrl.createOrderShip(foundReleaseGood, marketplaceStore, marketplaceOrder, companyDomain)
           }
-          await ecommerceCtrl.createOrderPackage(
+          foundReleaseGood = await ecommerceCtrl.createOrderPackage(
             tx,
             marketplaceOrder,
             companyDomain,
@@ -148,7 +154,7 @@ export async function completeBatchPicking(
           break
 
         default:
-          const orderPackage: OrderPackage = {
+          let orderPackage: OrderPackage = {
             name: OrderNoGenerator.orderPackage(),
             packageId: null,
             trackingNo: null,
@@ -178,8 +184,16 @@ export async function completeBatchPicking(
           })
 
           await tx.getRepository(OrderPackageItem).save(orderPackageItems)
+          orderPackage.orderPackageItems = orderPackageItems
+          foundReleaseGood.orderPackages = [orderPackage]
           break
       }
+
+      // trigger LMD API to create parcel
+      if (foundReleaseGood?.orderPackages?.length && foundReleaseGood.lmdOption && foundReleaseGood.lastMileDelivery && foundReleaseGood?.orderPackages?.some(op => op.parcelId == null)){
+        await createLmdParcel([foundReleaseGood], tx)
+      }
+      //
     }
 
     const pickPackTargetInventories: OrderInventory[] = targetInventories

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

@@ -37,6 +37,7 @@ import {
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
+import { createLmdParcel } from '../../../../utils'
 
 export const completePickingResolver = {
   async completePicking(_: any, { releaseGoodNo }, context: any) {
@@ -72,7 +73,11 @@ export async function completePicking(
       'bizplace.domain',
       'bizplace.company',
       'bizplace.company.domain',
+      'lastMileDelivery',
       'orderPackages',
+      'orderPackages.orderPackageItems',
+      'orderPackages.orderPackageItems.orderProduct',
+      'orderPackages.orderPackageItems.orderProduct.product',
       'orderProducts',
       'orderProducts.product',
       'orderProducts.productDetail',
@@ -258,12 +263,12 @@ export async function completePicking(
             }
           }
 
-          await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood)
+          releaseGood = await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood)
         }
         break
 
       default:
-        const orderPackage: OrderPackage = {
+        let orderPackage: OrderPackage = {
           name: OrderNoGenerator.orderPackage(),
           packageId: null,
           trackingNo: null,
@@ -293,6 +298,8 @@ export async function completePicking(
         })
 
         await tx.getRepository(OrderPackageItem).save(orderPackageItems)
+        orderPackage.orderPackageItems = orderPackageItems
+        releaseGood.orderPackages = [orderPackage]
         break
     }
 
@@ -431,6 +438,13 @@ export async function completePicking(
         await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
       }
     }
+
+    // trigger LMD API to create parcel
+    if (releaseGood?.orderPackages?.length && releaseGood.lmdOption && releaseGood.lastMileDelivery && releaseGood?.orderPackages?.some(op => op.parcelId == null)){
+      await createLmdParcel([releaseGood], tx)
+    }
+    //
+    
   } else {
     //update inventories obsolete to true
     await tx.getRepository(Inventory).update({ id: In(foundObsoleteInventories) }, { obsolete: true })

package/server/index.ts

@@ -6,3 +6,4 @@ export * from './graphql'
 export * from './graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet'
 export * from './graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details'
 export * from './migrations'
+export * from './utils'

package/server/utils/index.ts

@@ -2,3 +2,4 @@ export * from './inventory-util'
 export * from './worksheet-no-generator'
 export * from './datetime-util'
 export * from './worksheet-util'
+export * from './lmd-util'

package/server/utils/lmd-util.ts

@@ -0,0 +1,86 @@
+import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
+import { logger } from '@things-factory/env'
+import { GeoArea } from '@things-factory/geography'
+import { Bizplace } from '@things-factory/biz-base'
+import { ReleaseGood, OrderPackage } from '@things-factory/sales-base'
+
+export async function createLmdParcel(releaseGoods, tx) {
+  try {
+    let parcelsRequest = []
+    for (let releaseGood of releaseGoods) {
+
+      const lmd: LastMileDelivery = releaseGood.lastMileDelivery
+
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        where: { domain: releaseGood.domain },
+        relations: ['domain']
+      })
+
+      const senderGeoArea: GeoArea = await tx
+        .getRepository(GeoArea)
+        .findOne({ where: { postalCode: bizplace.postalCode } })
+
+      let data = {
+        courier: lmd.platform,
+        clientId: lmd?.clientId,
+        clientPass: lmd?.secretKey,
+        pickupAccountId: lmd?.pickupAccountId,
+        soldToAccountId: lmd?.soldToAccountId,
+        token: lmd?.accessToken,
+
+        recipient: releaseGood.attentionTo,
+        phone: releaseGood.phone1,
+        email: releaseGood.email,
+        address: releaseGood.deliveryAddress1,
+        address2: releaseGood.deliveryAddress2,
+        city: releaseGood.city,
+        postcode: releaseGood.postalCode,
+        district: releaseGood.city,
+        state: releaseGood.state,
+        country: releaseGood.country,
+
+        pAddress: bizplace.address,
+        pAddress2: bizplace.address2,
+        pCity: senderGeoArea.cityName,
+        pPostcode: senderGeoArea.postalCode,
+        pDistrict: senderGeoArea.cityName,
+        pState: senderGeoArea.stateName,
+        pCountry: senderGeoArea.countryCode,
+      }
+
+      let unprocessedOrderPackages: OrderPackage[] = releaseGood.orderPackages.filter(op => !op.parcelId)
+
+      let packagesData = unprocessedOrderPackages.map(op => {
+        return {
+          ...data,
+          refNo: op.id,
+          items: op.orderPackageItems.map(opi => {
+            return {
+              quantity: opi?.releaseQty?.toString() || ' ',
+              item: opi.orderProduct.product.name.slice(0, 49).trim() || ' ',
+              sku: opi.orderProduct.product.sku || ' ',
+              price: opi?.orderProduct.productDetail?.costPrice?.toString() || ' ',
+              weight: opi?.orderProduct.productDetail?.grossWeight?.toString() || ' ',
+              width: opi?.orderProduct.productDetail?.width?.toString() || ' ',
+              length: opi?.orderProduct.productDetail?.depth?.toString() || ' ',
+              height: opi?.orderProduct.productDetail?.height?.toString() || ' '
+            }
+          })
+        }
+      })
+      parcelsRequest.push(...packagesData)
+    }
+
+    if (parcelsRequest && parcelsRequest.length > 0) {
+      let res = await LastMileAPI.createParcel(
+        { ...releaseGoods[0].lastMileDelivery, platform: 'lmdMiddleware' },
+        parcelsRequest
+      )
+      for (let parcel of res) {
+        await tx.getRepository(OrderPackage).update({ id: parcel.refNo }, { parcelId: parcel.parcelId })
+      }
+    }
+  } catch (e) {
+    logger.error(`[lmd-create-parcel]: ${e}`)
+  }
+}