@things-factory/sales-base 4.3.342 → 4.3.344

package/server/service/replenishment/replenishment-query.ts

@@ -1,12 +1,31 @@
-import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
-import { getRepository, EntityManager, SelectQueryBuilder } from 'typeorm'
-import { Domain, ListParam, convertListParams } from '@things-factory/shell'
+import {
+  Arg,
+  Args,
+  Ctx,
+  FieldResolver,
+  Query,
+  Resolver,
+  Root
+} from 'type-graphql'
+import {
+  Brackets,
+  getRepository
+} from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
+import {
+  convertListParams,
+  Domain,
+  Filter,
+  ListParam,
+  Pagination,
+  Sorting
+} from '@things-factory/shell'
+
+import { OrderInventory } from '../order-inventory/order-inventory'
+import { OrderInventoryList } from '../order-inventory/order-inventory-types'
 import { Replenishment } from './replenishment'
 import { ReplenishmentList } from './replenishment-type'
-import { OrderInventory } from '../order-inventory/order-inventory'
-import { Inventory } from '@things-factory/warehouse-base'
-import { ORDER_INVENTORY_STATUS } from 'server/constants'
 
 @Resolver(Replenishment)
 export class ReplenishmentQuery {
@@ -59,6 +78,91 @@ export class ReplenishmentQuery {
     }
   }
 
+  @Query(returns => OrderInventoryList)
+  async replenishmentReport(
+    @Ctx() context: any,
+    @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
+    @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
+    @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
+  ): Promise<OrderInventoryList> {
+
+    let bizplaceFilter = filters.find(itm => itm.name === 'bizplace')
+    let orderNoFilter = filters.find(item => item.name === 'orderNo')
+    let statusFilter = filters.find(itm => itm.name === 'status')
+    let productInfoFilter = filters.find(itm => itm.name === 'productInfo')
+    let pickingBinFilter = filters.find(itm => itm.name === 'pickingBin')
+
+    let productFilterValue: string
+    if (productInfoFilter) {
+      productFilterValue = `%${productInfoFilter.value.toLowerCase()}%`
+    }
+
+    let pickingBinValues: string[] = []
+    if (pickingBinFilter) {
+      pickingBinValues = pickingBinFilter.value.split(',').map(value => value.trim())
+    }
+
+    const qb = getRepository(OrderInventory).createQueryBuilder('oi')
+
+    qb.select('r.name', 'orderNo')
+      .addSelect('p.sku', 'productSKU')
+      .addSelect(`string_agg(l.name, ', ')`, 'pickingBin')
+      .addSelect('sum(oi.release_qty)', 'transferQty')
+      .addSelect('r.status', 'status')
+      .addSelect('biz.id', 'bizplaceId')
+      .addSelect('biz.name', 'bizplaceName')
+      .leftJoin('oi.bizplace', 'biz')
+      .leftJoin('oi.binLocation', 'l')
+      .innerJoin('oi.product', 'p')
+      .innerJoin('oi.replenishment', 'r')
+      .where('oi.domain_id = :domainId', { domainId: context.state.domain.id })
+      .andWhere(`r.status NOT IN (:...statuses)`, { statuses: ['DONE', 'CANCELLED'] })
+
+    bizplaceFilter ? 
+    qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplaceFilter.value }) : ''
+
+    orderNoFilter ? 
+    qb.andWhere('r.name ilike :orderNo', { orderNo: orderNoFilter.value }) : ''
+
+    statusFilter ? 
+    qb.andWhere('r.status = :status', { status: statusFilter.value }) : ''
+
+    productInfoFilter ?
+    qb.andWhere(
+      new Brackets(qb => {
+        qb.where('p.name ilike :productInfo', { productInfo: productFilterValue })
+          .orWhere('p.sku ilike :productInfo', { productInfo: productFilterValue })
+          .orWhere('p.description ilike :productInfo', { productInfo: productFilterValue })
+          .orWhere('p.brand ilike :productInfo', { productInfo: productFilterValue })
+          .orWhere('p.brand_sku ilike :productInfo', { productInfo: productFilterValue })
+      })
+    ) : ''
+
+    pickingBinFilter ?
+    qb.andWhere(`l.name in (:...pickingBins)`, { pickingBins: pickingBinValues }) : ''
+
+    qb.groupBy('p.sku')
+      .addGroupBy('oi.replenishment_id')
+      .addGroupBy('r.id')
+      .addGroupBy('biz.id')
+      .orderBy('r.name')
+
+    let items = await qb.getRawMany()
+    let total = items.length
+
+    items = items.map(itm => {
+      return {
+        ...itm,
+        bizplace: {
+          id: itm.bizplaceId,
+          name: itm.bizplaceName
+        }
+      }
+    })
+    return { items, total }
+  }
+
+
   @FieldResolver(type => Domain)
   async domain(@Root() replenishment: Replenishment): Promise<Domain> {
     return await getRepository(Domain).findOne(replenishment.domainId)

package/server/utils/inventory-util.ts

@@ -107,8 +107,14 @@ export const InventoryUtil = {
                 CASE WHEN (COALESCE(SUM(COALESCE(i.qty, 0)) - GREATEST(SUM(COALESCE(i.locked_qty, 0)), 0) - GREATEST(COALESCE(pds.unassigned_qty, 0), 0) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)),0)) < 0 THEN 0
                 ELSE COALESCE(SUM(COALESCE(i.qty, 0)) - GREATEST(SUM(COALESCE(i.locked_qty, 0)), 0) - GREATEST(COALESCE(pds.unassigned_qty, 0), 0) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)),0) END
               ) AS "remainQty",
-              COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - COALESCE(pds.unassigned_uom_value, 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)),0) AS "remainUomValue",
-              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - COALESCE(pds.unassigned_uom_value, 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)), ' ', pd.uom) AS "remainUomValueWithUom",
+              (
+                CASE WHEN (COALESCE(SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - GREATEST(COALESCE(pds.unassigned_uom_value, 0), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)),0)) < 0 THEN 0
+                ELSE COALESCE(SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - GREATEST(COALESCE(pds.unassigned_uom_value, 0), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)),0) END
+              ) AS "remainUomValue",
+              (
+                CASE WHEN (SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - GREATEST(COALESCE(pds.unassigned_uom_value, 0), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0))) < 0 THEN concat(0, ' ', pd.uom)
+                ELSE concat(SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - GREATEST(COALESCE(pds.unassigned_uom_value, 0), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)), ' ', pd.uom) END
+              ) AS "remainUomValueWithUom",
               COALESCE(SUM(COALESCE(i.transfer_qty, 0)), 0) AS "transferQty",
               COALESCE(SUM(COALESCE(i.transfer_uom_value, 0)), 0) AS "transferUomValue",
               'SINGLE' AS "groupType"
@@ -166,7 +172,10 @@ export const InventoryUtil = {
                 CASE WHEN ((SUM(COALESCE(i2.qty, 0)) - GREATEST(SUM(COALESCE(i2.locked_qty, 0)), 0) - GREATEST(COALESCE(pds2.unassigned_qty, 0), 0) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty)) < 0 THEN 0
                 ELSE (SUM(COALESCE(i2.qty, 0)) - GREATEST(SUM(COALESCE(i2.locked_qty, 0)), 0) - GREATEST(COALESCE(pds2.unassigned_qty, 0), 0) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) END
               ) AS "availableQty",
-              (SUM(COALESCE(i2.uom_value, 0)) - SUM(COALESCE(i2.locked_uom_value, 0)) - COALESCE(pds2.unassigned_uom_value, 0) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue",
+              (
+                CASE WHEN ((SUM(COALESCE(i2.uom_value, 0)) - GREATEST(SUM(COALESCE(i2.locked_uom_value, 0)), 0) - GREATEST(COALESCE(pds2.unassigned_uom_value, 0), 0) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)) < 0 THEN 0
+                ELSE (SUM(COALESCE(i2.uom_value, 0)) - GREATEST(SUM(COALESCE(i2.locked_uom_value, 0)), 0) - GREATEST(COALESCE(pds2.unassigned_uom_value, 0), 0) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty) END
+              ) AS "availableUomValue",
               (SUM(COALESCE(i2.transfer_qty, 0)) / min(pbs.bundle_qty)) AS "transferQty",
               (SUM(COALESCE(i2.transfer_uom_value, 0)) / min(pbs.bundle_qty)) AS "transferUomValue",
               pbs.product_detail_id
@@ -299,8 +308,14 @@ export const InventoryUtil = {
               p.id AS "productId",
               i.product_detail_id AS "productDetailId",
               SUM(COALESCE(i.qty, 0)) - GREATEST(SUM(COALESCE(i.locked_qty, 0)), 0) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)) - GREATEST(SUM(COALESCE(pds.unassigned_qty, 0)), 0)  AS "remainQty",
-              SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)) AS "remainUomValue",
-              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)), ' ', i.uom) AS "remainUomValueWithUom",
+              (
+                CASE WHEN (SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - GREATEST(SUM(COALESCE(pds.unassigned_uom_value, 0)), 0)) < 0 THEN 0
+                ELSE SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - GREATEST(SUM(COALESCE(pds.unassigned_uom_value, 0)), 0) END
+              )  AS "remainUomValue",
+              (
+                CASE WHEN (SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - GREATEST(SUM(COALESCE(pds.unassigned_uom_value, 0)), 0)) < 0 THEN concat(0, ' ', i.uom)
+                ELSE concat(SUM(COALESCE(i.uom_value, 0)) - GREATEST(SUM(COALESCE(i.locked_uom_value, 0)), 0) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - GREATEST(SUM(COALESCE(pds.unassigned_uom_value, 0)), 0), ' ', i.uom) END
+              ) AS "remainUomValueWithUom",
               'SINGLE' AS "groupType"
             FROM
               inventories i
@@ -339,7 +354,7 @@ export const InventoryUtil = {
             INNER JOIN (
               SELECT pbs.product_id, pbs.product_bundle_id, min(pbs.bundle_qty),
               (SUM(COALESCE(i2.qty, 0)) - GREATEST(SUM(COALESCE(i2.locked_qty, 0)), 0) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
-              (SUM(COALESCE(i2.uom_value, 0)) - SUM(COALESCE(i2.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue",
+              (SUM(COALESCE(i2.uom_value, 0)) - GREATEST(SUM(COALESCE(i2.locked_uom_value, 0)), 0) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue",
               pbs.product_detail_id
               FROM product_bundle_settings pbs 
               LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id AND i2.domain_id = $1