@things-factory/sales-base 5.0.13 → 6.0.0-alpha.1

package/server/utils/inventory-util.ts

@@ -1,9 +1,9 @@
-import { EntityManager, Equal, getRepository, In, Not, Raw, Repository, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, Equal, In, Not, Raw, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product, ProductBundle } from '@things-factory/product-base'
-import { Domain, ListParam } from '@things-factory/shell'
+import { Domain, Filter, getRepository, ListParam } from '@things-factory/shell'
 import {
   Inventory,
   INVENTORY_STATUS,
@@ -46,11 +46,16 @@ export const InventoryUtil = {
    * @param {Object} trxMgr
    * @returns { object } {items, total}
    */
-  async bizplaceProductInventory(bizplaces: Bizplace[], params: ListParam, context: any, trxMgr: EntityManager) {
+  async bizplaceProductInventory(
+    bizplaces: Bizplace[],
+    params: ListParam,
+    context: ResolverContext,
+    trxMgr: EntityManager
+  ) {
     try {
       let filters = params.filters
 
-      const { domain }: { domain: Domain } = context.state
+      const { domain } = context.state
 
       const { bizplaceIds, productWhereClause, bundleWhereClause, whereClause, batchBundle, productDetailWhereClause } =
         await getConditions(bizplaces, filters, trxMgr, false)
@@ -216,10 +221,15 @@ export const InventoryUtil = {
    * @param {Object} trxMgr
    * @returns { object } {items, total}
    */
-  async bizplaceInventoryProductGroup(bizplaces: Bizplace[], params: ListParam, context: any, trxMgr: EntityManager) {
+  async bizplaceInventoryProductGroup(
+    bizplaces: Bizplace[],
+    params: ListParam,
+    context: ResolverContext,
+    trxMgr: EntityManager
+  ) {
     try {
       let filters = params.filters
-      const { domain }: { domain: Domain } = context.state
+      const { domain } = context.state
 
       const { bizplaceIds, productWhereClause, bundleWhereClause, whereClause, batchBundle } = await getConditions(
         bizplaces,
@@ -227,6 +237,8 @@ export const InventoryUtil = {
         trxMgr
       )
 
+      const _groupType = filters.find(res => res.name == 'groupType')
+
       let queryStrings = `
         CREATE TEMP TABLE temp_inventory_product_group AS (
           SELECT * FROM (
@@ -324,18 +336,50 @@ export const InventoryUtil = {
         )
       `
 
+      let filterGroupTypeQuery
+
+      if (_groupType) {
+        if (_groupType.value === 'SINGLE') {
+          filterGroupTypeQuery = `where "groupType"= 'SINGLE' `
+        } else {
+          filterGroupTypeQuery = `where "groupType"= 'BUNDLE' `
+        }
+      }
+
+      let sortingArr = params.sortings || []
+
+      let sortedBy = []
+
+      if (sortingArr.length > 0) {
+        sortingArr.forEach(element => {
+          if (element.desc) {
+            sortedBy.push(`"${element.name}" DESC `)
+          } else {
+            sortedBy.push(`"${element.name}" `)
+          }
+        })
+      }
+
       await trxMgr.query(queryStrings, [domain.id])
 
-      const [{ total }]: any = await trxMgr.query(`select count(*) as total from temp_inventory_product_group`)
+      const [{ total }]: any = await trxMgr.query(
+        `select count(*) as total from temp_inventory_product_group ${filterGroupTypeQuery ? filterGroupTypeQuery : ''}`
+      )
       let items: any[] = []
 
       if (params?.pagination) {
-        items = await trxMgr.query(`select * from temp_inventory_product_group OFFSET $1 LIMIT $2`, [
-          (params.pagination.page - 1) * params.pagination.limit,
-          params.pagination.limit
-        ])
+        items = await trxMgr.query(
+          `select * from temp_inventory_product_group  ${filterGroupTypeQuery ? filterGroupTypeQuery : ''} ${
+            sortingArr.length > 0 ? ' Order by ' + sortedBy.toString() : ''
+          } OFFSET $1 LIMIT $2`,
+          [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
+        )
       } else {
-        items = await trxMgr.query(`select * from temp_inventory_product_group`)
+        items = await trxMgr.query(
+          `select * from temp_inventory_product_group ${filterGroupTypeQuery ? filterGroupTypeQuery : ''} ${
+            sortingArr.length > 0 ? ' Order by ' + sortedBy.toString() : ''
+          }`
+        )
       }
 
       await trxMgr.query(`drop table temp_inventory_product_group`)
@@ -346,10 +390,15 @@ export const InventoryUtil = {
     }
   },
 
-  async inventoryProductGroupOpenAPI(bizplaces: Bizplace[], params: ListParam, context: any, trxMgr: EntityManager) {
+  async inventoryProductGroupOpenAPI(
+    bizplaces: Bizplace[],
+    params: ListParam,
+    context: ResolverContext,
+    trxMgr: EntityManager
+  ) {
     try {
       let filters = params.filters
-      const { domain }: { domain: Domain } = context.state
+      const { domain } = context.state
 
       const { apiWhereClause } = await getConditions(bizplaces, filters, trxMgr)
 
@@ -515,8 +564,8 @@ export const InventoryUtil = {
   },
 
   async checkPalletDuplication(palletId: string, warehouseDomain: Domain, trxMgr: EntityManager): Promise<void> {
-    const duplicatedPalletCnt: number = await trxMgr.getRepository(Inventory).count({
-      domain: warehouseDomain,
+    const duplicatedPalletCnt: number = await trxMgr.getRepository(Inventory).countBy({
+      domain: { id: warehouseDomain.id },
       palletId,
       status: Not(Equal(INVENTORY_STATUS.TERMINATED))
     })
@@ -525,7 +574,7 @@ export const InventoryUtil = {
 
     const duplicatedReusablePalletCnt: number = await trxMgr.getRepository(Pallet).count({
       where: {
-        domain: warehouseDomain,
+        domain: { id: warehouseDomain.id },
         name: palletId
       }
     })
@@ -551,7 +600,8 @@ export const InventoryUtil = {
     locationSortingRules: any = [],
     customerBizplace: Bizplace,
     domain: Domain,
-    trxMgr: EntityManager
+    trxMgr: EntityManager,
+    batchId?: string
   ): Promise<OrderInventory[]> {
     let qb: SelectQueryBuilder<Inventory> = trxMgr.getRepository(Inventory).createQueryBuilder('iv')
     qb.leftJoinAndSelect('iv.location', 'loc')
@@ -571,14 +621,50 @@ export const InventoryUtil = {
         locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
       })
 
-    if (locationSortingRules?.length) {
-      locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-        idx === 0
-          ? qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-          : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-      })
-    } else {
-      qb.addOrderBy('"iv"."created_at"', 'ASC')
+    if (batchId) {
+      qb.andWhere('"iv"."batch_id" = :batchId', { batchId: batchId })
+    }
+
+    let locationSorting = function (qb: SelectQueryBuilder<Inventory>, locationSortingRules) {
+      if (locationSortingRules?.length) {
+        locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+          idx === 0
+            ? qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+            : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+        })
+      } else {
+        qb.addOrderBy('"loc"."name"', 'ASC')
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+      }
+      return qb
+    }
+
+    switch (product?.pickingStrategy) {
+      case 'FIFO':
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'LIFO':
+        qb.addOrderBy('"iv"."created_at"', 'DESC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'FEFO':
+        qb.addOrderBy('"iv"."expiration_date"', 'ASC')
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'FMFO':
+        qb.addOrderBy('"iv"."manufacture_date"', 'ASC')
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'LOCATION':
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      default:
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
     }
 
     let inventories: Inventory[] = await qb.getMany()
@@ -633,7 +719,7 @@ interface Conditions {
 
 async function getConditions(
   bizplaces: Bizplace[],
-  filters: [{ name: string; operator: string; value: any }],
+  filters: Filter[],
   trxMgr: EntityManager,
   hasRemainingQty: Boolean = true
 ): Promise<Conditions> {
@@ -693,6 +779,9 @@ async function getConditions(
             whereClause += `AND LOWER("productBrand") LIKE '${value.toLowerCase()}'`
             break
 
+          case 'productSKU':
+            whereClause += `AND LOWER("productSKU") LIKE '${value.toLowerCase()}'`
+
           case 'productName':
             const products: Product[] = await trxMgr.getRepository(Product).find({
               select: ['id'],
@@ -889,13 +978,16 @@ async function generateInventoryHistory(
   const domain: Domain = inventory.domain
   const location: Location = inventory.location
 
-  const seq: number = await invHistoryRepo.count({ domain: inventory.domain, palletId: inventory.palletId })
+  const seq: number = await invHistoryRepo.countBy({
+    domain: { id: inventory.domain.id },
+    palletId: inventory.palletId
+  })
   let openingQty: number = 0
   let openingUomValue: number = 0
 
   if (seq) {
-    const lastInvHistory: InventoryHistory = await invHistoryRepo.findOne({
-      domain: inventory.domain,
+    const lastInvHistory: InventoryHistory = await invHistoryRepo.findOneBy({
+      domain: { id: inventory.domain.id },
       palletId: inventory.palletId,
       seq: seq - 1
     })
@@ -965,10 +1057,10 @@ export async function switchLocationStatus(
 ): Promise<Location> {
   const invRepo: Repository<Inventory> = trxMgr?.getRepository(Inventory) || getRepository(Inventory)
   const locationRepo: Repository<Location> = trxMgr?.getRepository(Location) || getRepository(Location)
-  const allocatedItemsCnt: number = await invRepo.count({
-    domain,
+  const allocatedItemsCnt: number = await invRepo.countBy({
+    domain: { id: domain.id },
     status: INVENTORY_STATUS.STORED,
-    location
+    location: { id: location.id }
   })
 
   if (!allocatedItemsCnt && location.status !== LOCATION_STATUS.EMPTY) {
@@ -1007,8 +1099,9 @@ export function _composeTargetInventories(product: Product, record: any, invento
       packingType,
       packingSize,
       batchId,
+      batchIdRef,
       uom
-    }: { packingType: string; packingSize: number; batchId: string; uom: string } = inventory
+    }: { packingType: string; packingSize: number; batchId: string; batchIdRef: string; uom: string } = inventory
 
     let orderInventory: OrderInventory = new OrderInventory()
 
@@ -1042,6 +1135,7 @@ export function _composeTargetInventories(product: Product, record: any, invento
       packingType,
       packingSize,
       batchId,
+      batchIdRef,
       uom,
       product,
       type: ORDER_TYPES.RELEASE_OF_GOODS

package/translations/en.json

@@ -1,4 +1,8 @@
 {
+  "error.Manifest(s) (x) already in open status": "Manifest(s) ({x}) already in open status",
+  "error.release_order_not_found": "release order not found",
+  "error.tracking_no_already_scanned_before": "tracking no already scanned before",
+  "error.tracking_no_belongs_to_x": "tracking no belongs to {x}",
   "field.customer": "customer",
   "field.issued_on": "issued on",
   "field.payment_due": "payment due",

package/translations/ko.json

@@ -16,5 +16,9 @@
   "field.options": "옵션",
   "field.unit": "단위",
   "field.start_at": "시작 시간",
-  "field.end_at": "완료 시간"
-}
+  "field.end_at": "완료 시간",
+  "error.Manifest(s) (x) already in open status": "[ko] Manifest(s) ({x}) already in open status",
+  "error.release_order_not_found": "[ko] release order not found",
+  "error.tracking_no_belongs_to_x": "[ko] tracking no belongs to {x}",
+  "error.tracking_no_already_scanned_before": "[ko] tracking no already scanned before"
+}

package/translations/ms.json

@@ -16,5 +16,9 @@
   "field.options": "pilihan-pilihan",
   "field.unit": "unit",
   "field.start_at": "bermula pada",
-  "field.end_at": "berakhir pada"
+  "field.end_at": "berakhir pada",
+  "error.Manifest(s) (x) already in open status": "[ms] Manifest(s) ({x}) already in open status",
+  "error.release_order_not_found": "[ms] release order not found",
+  "error.tracking_no_belongs_to_x": "[ms] tracking no belongs to {x}",
+  "error.tracking_no_already_scanned_before": "[ms] tracking no already scanned before"
 }