@things-factory/warehouse-base 4.3.637 → 4.3.638

package/server/service/inventory/inventory.ts

@@ -1,4 +1,10 @@
-import { Field, Float, ID, Int, ObjectType } from 'type-graphql'
+import {
+  Field,
+  Float,
+  ID,
+  Int,
+  ObjectType
+} from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -13,8 +19,14 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain, ScalarDate } from '@things-factory/shell'
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  Domain,
+  ScalarDate
+} from '@things-factory/shell'
 
 import { InventoryChange } from '../inventory-change/inventory-change'
 import { InventoryItem } from '../inventory-item/inventory-item'
@@ -152,130 +164,26 @@ export class Inventory {
   @Field({ nullable: true })
   uom: string
 
-  @Column({
-    nullable: true,
-    type: 'decimal',
-    scale: 3,
-    transformer: {
-      to: (value: string | null) => value,
-      from: (value: string | null) => {
-        if (value === null || value === undefined) return null
-        const parsed = parseFloat(value)
-        return isNaN(parsed) ? null : parsed
-      }
-    }
-  })
-  @Field(type => Float, { nullable: true })
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
   uomValue: number
 
-  @Column({
-    nullable: true,
-    type: 'decimal',
-    scale: 3,
-    transformer: {
-      to: (value: string | null) => value,
-      from: (value: string | null) => {
-        if (value === null || value === undefined) return null
-        const parsed = parseFloat(value)
-        return isNaN(parsed) ? null : parsed
-      }
-    }
-  })
-  @Field(type => Float, { nullable: true })
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
   lockedUomValue: number
 
-  @Column({
-    nullable: true,
-    type: 'decimal',
-    scale: 3,
-    transformer: {
-      to: (value: string | null) => value,
-      from: (value: string | null) => {
-        if (value === null || value === undefined) return null
-        const parsed = parseFloat(value)
-        return isNaN(parsed) ? null : parsed
-      }
-    }
-  })
-  @Field(type => Float, { nullable: true })
+  @Column('float')
+  @Field({ nullable: true })
+  qty: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
   lockedQty: number
 
   @Column('float', { nullable: true })
-  @Field(type => Float, { nullable: true })
+  @Field({ nullable: true })
   unitCost: number
 
-  @Column({
-    nullable: true,
-    type: 'decimal',
-    scale: 3,
-    transformer: {
-      to: (value: string | null) => value,
-      from: (value: string | null) => {
-        if (value === null || value === undefined) return null
-        const parsed = parseFloat(value)
-        return isNaN(parsed) ? null : parsed
-      }
-    }
-  })
-  @Field(type => Float, { nullable: true })
-  qty: number
-
-  @Column('float', { default: 0 })
-  @Field(type => Float)
-  transferQty: number
-
-  @Column('float', { default: 0 })
-  @Field(type => Float)
-  transferUomValue: number
-
-  @Field(type => Float, { nullable: true })
-  nonLoadedQty: number
-
-  @Field(type => Float, { nullable: true })
-  nonLoadedUomValue: number
-
-  @Field(type => Float, { nullable: true })
-  remainUomValue?: number
-
-  @Field(type => Float, { nullable: true })
-  putawayQty: number
-
-  @Field(type => Float, { nullable: true })
-  availableQty: number
-
-  @Field(type => Float, { nullable: true })
-  releaseQty: number
-
-  @Field(type => Float, { nullable: true })
-  quarantineQty: number
-
-  @Field(type => Float, { nullable: true })
-  reserveQty: number
-
-  @Field(type => Float, { nullable: true })
-  draftQty: number
-
-  @Field(type => Float, { nullable: true })
-  warehouseQty: number
-
-  @Field(type => Float, { nullable: true })
-  obsoleteQty: number
-
-  @Field(type => Float, { nullable: true })
-  minQty: number
-
-  @Field(type => Float, { nullable: true })
-  pickingShelfQty: number
-
-  @Field(type => Float, { nullable: true })
-  storageQty: number
-
-  @Field(type => Float, { nullable: true })
-  insufficientQty: number
-
-  @Field(type => Float, { nullable: true })
-  damageQty: number
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   adjustmentCode: string
@@ -304,6 +212,14 @@ export class Inventory {
   @Field({ nullable: true })
   remark: string
 
+  @Column('float', { default: 0 })
+  @Field()
+  transferQty: number
+
+  @Column('float', { default: 0 })
+  @Field()
+  transferUomValue: number
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   lockInventory: boolean
@@ -345,15 +261,18 @@ export class Inventory {
   @Field({ nullable: true })
   productBrand: string
 
-  @Field({ nullable: true })
-  isInventoryDecimal: boolean
-
   @Field(type => Float, { nullable: true })
   averageUnitCost: number
 
-  @Field(type => Float, { nullable: true })
+  @Field(type => Int, { nullable: true })
   remainQty: number
 
+  @Field(type => Int, { nullable: true })
+  nonLoadedQty: number
+
+  @Field(type => Float, { nullable: true })
+  nonLoadedUomValue: number
+
   @Field({ nullable: true })
   initialInboundAt: string
 
@@ -386,6 +305,9 @@ export class Inventory {
   @Field({ nullable: true })
   remainUomValueWithUom?: string
 
+  @Field({ nullable: true })
+  remainUomValue?: number
+
   @Field({ nullable: true })
   changeCount?: number
 
@@ -398,6 +320,45 @@ export class Inventory {
   @Field({ nullable: true })
   inventoryItemCount: number
 
+  @Field({ nullable: true })
+  putawayQty: number
+
+  @Field({ nullable: true })
+  availableQty: number
+
+  @Field({ nullable: true })
+  releaseQty: number
+
+  @Field({ nullable: true })
+  quarantineQty: number
+
+  @Field({ nullable: true })
+  reserveQty: number
+
+  @Field({ nullable: true })
+  draftQty: number
+
+  @Field({ nullable: true })
+  warehouseQty: number
+
+  @Field({ nullable: true })
+  obsoleteQty: number
+
+  @Field({ nullable: true })
+  minQty: number
+
+  @Field({ nullable: true })
+  pickingShelfQty: number
+
+  @Field({ nullable: true })
+  storageQty: number
+
+  @Field({ nullable: true })
+  insufficientQty: number
+
+  @Field({ nullable: true })
+  damageQty: number
+
   @Field({ nullable: true })
   condition: string
 

package/server/service/inventory-history/inventory-history-query.ts

@@ -269,8 +269,8 @@ export class InventoryHistoryQuery {
         SELECT prd.sku as sku, prd.name AS product_name, prd.description AS product_description, prd.type as product_type, prd.aux_value_1 AS product_aux_value_1, trim(invh.batch_id) as batch_id, invh.product_id,
         invh.packing_type, invh.bizplace_id, invh.domain_id,
         invh.ref_order_id, invh.order_no, invh.order_ref_no, invh.transaction_type, invh.status, invh.created_at,
-        TRUNC(CAST(invh.qty AS NUMERIC), 3) as qty, TRUNC(CAST(invh.opening_qty AS NUMERIC), 3) as opening_qty, 
-        invh.uom, TRUNC(CAST(COALESCE(invh.uom_value, 0) AS NUMERIC), 3) as uom_value, TRUNC(CAST(COALESCE(invh.opening_uom_value, 0) AS NUMERIC), 3) as opening_uom_value
+        invh.qty, invh.opening_qty, 
+        invh.uom, COALESCE(invh.uom_value, 0) as uom_value, COALESCE(invh.opening_uom_value, 0) as opening_uom_value
         FROM reduced_inventory_histories invh
         INNER JOIN temp_products prd ON prd.id = invh.product_id::uuid
         WHERE
@@ -288,10 +288,10 @@ export class InventoryHistoryQuery {
         create temp table temp_inv_history as (
           SELECT src.sku, src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
           src.bizplace_id, src.domain_id,
-          TRUNC(CAST(SUM(COALESCE(src.qty,0)) AS NUMERIC), 3) AS qty,
-          TRUNC(CAST(SUM(COALESCE(src.opening_qty,0)) AS NUMERIC), 3) AS opening_qty,
-          TRUNC(CAST(SUM(COALESCE(src.uom_value,0)) AS NUMERIC), 3) AS uom_value,
-          TRUNC(CAST(SUM(COALESCE(src.opening_uom_value,0)) AS NUMERIC), 3) AS opening_uom_value,
+          SUM(COALESCE(src.qty,0)) AS qty,
+          SUM(COALESCE(src.opening_qty,0)) AS opening_qty,
+          SUM(COALESCE(src.uom_value,0)) AS uom_value,
+          SUM(COALESCE(src.opening_uom_value,0)) AS opening_uom_value,
           'Opening Balance' AS order_name,
           '-' AS ref_no,
           '-' as transaction_type,
@@ -304,7 +304,7 @@ export class InventoryHistoryQuery {
           src.bizplace_id, src.domain_id
           UNION ALL
           SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, TRUNC(CAST(sum(qty) AS NUMERIC), 3) as qty, TRUNC(CAST(sum(opening_qty) AS NUMERIC), 3) as opening_qty, TRUNC(CAST(sum(uom_value) AS NUMERIC), 3) as uom_value, TRUNC(CAST(sum(opening_uom_value) AS NUMERIC), 3) as opening_uom_value, 
+          domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value, 
           order_name, ref_no, '-' as transaction_type ,1 AS rn, MIN(created_at) - $2::interval as created_at, (MIN(created_at) - $2::interval)::DATE as created_date
           FROM (
             SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.bizplace_id, 
@@ -327,7 +327,7 @@ export class InventoryHistoryQuery {
           domain_id, order_name, ref_no, rn
           UNION ALL
           SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, TRUNC(CAST(sum(qty) AS NUMERIC), 3) as qty, TRUNC(CAST(sum(opening_qty) AS NUMERIC), 3) as opening_qty, TRUNC(CAST(sum(uom_value) AS NUMERIC), 3) as uom_value, TRUNC(CAST(sum(opening_uom_value) AS NUMERIC), 3) as opening_uom_value,
+          domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value,
           CASE 
           WHEN transaction_type IN ('PICKING', 'CANCEL_ORDER') THEN order_no
           ELSE order_name
@@ -364,7 +364,7 @@ export class InventoryHistoryQuery {
           domain_id, inv_movement.transaction_type,inv_movement.order_no,order_name, ref_no, rn, created_at
           UNION ALL
           SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, TRUNC(CAST(sum(-opening_qty) AS NUMERIC), 3) as qty, TRUNC(CAST(sum(opening_qty) AS NUMERIC), 3) as opening_qty, TRUNC(CAST(sum(-opening_uom_value) AS NUMERIC), 3) as uom_value, TRUNC(CAST(sum(opening_uom_value) AS NUMERIC), 3) as opening_uom_value,
+          domain_id, sum(-opening_qty) as qty, sum(opening_qty) as opening_qty, sum(-opening_uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value,
           order_name, ref_no, transaction_type,1 AS rn, created_at - $2::interval as created_at, created_at::date as created_date
           FROM (
             SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
@@ -413,11 +413,11 @@ export class InventoryHistoryQuery {
         domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value, order_name, ref_no, transaction_type, created_at::date
         from(
           select sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, qty, opening_qty, TRUNC(CAST(uom_value AS NUMERIC), 3) as uom_value, opening_uom_value, order_name, ref_no, transaction_type,created_at::date
+          domain_id, qty, opening_qty, round(uom_value::decimal,2) as uom_value, opening_uom_value, order_name, ref_no, transaction_type,created_at::date
           from temp_inv_history invh where
           exists (
             select 1 from (
-              select sku, batch_id, product_name, packing_type, TRUNC(CAST(sum(qty) AS NUMERIC), 3) as totalQty, count(*) as totalRow from temp_inv_history ih2 
+              select sku, batch_id, product_name, packing_type, sum(qty) as totalQty, count(*) as totalRow from temp_inv_history ih2 
               group by sku, batch_id, product_name, packing_type
             ) src 
             where src.sku = invh.sku and src.batch_id = invh.batch_id and src.product_name = invh.product_name and src.packing_type = invh.packing_type
@@ -1168,10 +1168,7 @@ export class InventoryHistoryQuery {
     await tx.query(
       `
       create temp table tmp_src on commit drop as (
-        select domain_id, pallet_id, carton_id, seq, 
-        TRUNC(qty::numeric,3) as qty, 
-        TRUNC(uom_value::numeric,3) as uom_value, 
-        packing_type, batch_id, batch_id_ref, created_at, status, unit_cost,
+        select domain_id, pallet_id, carton_id, seq, qty, uom_value, packing_type, batch_id, batch_id_ref, created_at, status, unit_cost,
         product_id::uuid as product_id, bizplace_id::uuid as bizplace_id, location_id::uuid as location_id 
         from reduced_inventory_histories rih 
         where domain_id = $1 and created_at < $2::timestamp + $3::INTERVAL + '1 day'::INTERVAL 
@@ -1183,10 +1180,7 @@ export class InventoryHistoryQuery {
     await tx.query(
       `
       CREATE TEMP TABLE tmp_src_group on commit drop AS (
-        select ih.domain_id, ih.pallet_id, 
-        TRUNC(sum(ih.qty)::numeric,3) as qty, 
-        TRUNC(sum(ih.uom_value)::numeric,3) as uom_value, 
-        max(ih.seq) as last_seq, max(ih.created_at) as created_at,
+        select ih.domain_id, ih.pallet_id, sum(ih.qty) as qty, sum(ih.uom_value) as uom_value, max(ih.seq) as last_seq, max(ih.created_at) as created_at,
         min(ih.created_at) as initial_inbound_at
         from tmp_src ih
         group by ih.domain_id, ih.pallet_id
@@ -1224,9 +1218,8 @@ export class InventoryHistoryQuery {
     const result: any = await tx.query(
       ` 
           select 
-          rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", 
-          TRUNC(rih.qty::numeric,3) as "remainQty", 
-          TRUNC(rih.uom_value::numeric,3) as "uomValue", rih.uom, rih.last_seq, rih.created_at,
+          rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", 
+          TRUNC(rih.uom_value::numeric,2) as "uomValue", rih.uom, rih.last_seq, rih.created_at,
           rih.initial_inbound_at as "initialInboundAt", rih.unit_cost as "unitCost",
           case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
           rih.batch_id_ref as "batchIdRef", rih.product_id, rih.packing_type as "packingType", rih.bizplace_id, rih.location_id,
@@ -1245,7 +1238,7 @@ export class InventoryHistoryQuery {
             when (rih.expiration_date - (prd.outbound_alert || ' days')::INTERVAL) < now() then 'Risky'
           else 'Normal' end as expiry,
           i.adjustment_note as "adjustmentNote",
-          TRUNC(coalesce((
+          coalesce((
             select sum(oi1.release_qty) as nonLoadedQty from order_inventories oi1
             inner join release_goods rg1 on rg1.id = oi1.release_good_id 
             where rg1.status in ('PICKING', 'LOADING') 
@@ -1253,7 +1246,7 @@ export class InventoryHistoryQuery {
             and oi1.status in ('PICKED', 'LOADING')
             and rg1.domain_id = '${domain.id}'
             group by oi1.inventory_id
-          ),0)::numeric,3) as "nonLoadedQty",
+          ),0) as "nonLoadedQty",
           TRUNC(coalesce((
             select sum(oi1.release_uom_value) as nonLoadedUomValue from order_inventories oi1
             inner join release_goods rg1 on rg1.id = oi1.release_good_id 
@@ -1262,9 +1255,9 @@ export class InventoryHistoryQuery {
             and oi1.status in ('PICKED', 'LOADING')
             and rg1.domain_id = '${domain.id}'
             group by oi1.inventory_id
-          ),0)::numeric,3) as "nonLoadedUomValue",
-          TRUNC(i.transfer_qty::numeric,3) as "transferQty",
-          TRUNC(i.transfer_uom_value::numeric,3) as "transferUomValue"
+          ),0)::numeric,2) as "nonLoadedUomValue",
+          i.transfer_qty as "transferQty",
+          i.transfer_uom_value as "transferUomValue"
           from tmp_data rih
           left join pallets plt on plt.id = rih.reusable_pallet_id
           inner join products prd on prd.id = rih.product_id
@@ -1670,14 +1663,14 @@ async function massageInventorySummary(tx: EntityManager, params: ListParam, biz
     `
     create temp table temp_inventory_summary ON COMMIT DROP as (
       select src.*,
-      TRUNC(CAST(opening_qty + adjustment_qty + total_in_qty + total_out_qty + missing_qty AS NUMERIC), 3) as closing_qty
+      opening_qty + adjustment_qty + total_in_qty + total_out_qty + missing_qty  as closing_qty
       from (
         select prd.sku AS product_sku, prd.name as product_name, prd.description as product_description, prd.type AS product_type, ih.packing_type, ih.packing_size,
-        TRUNC(CAST(sum(case when ih.created_at >= $1 and ih.transaction_type = 'ADJUSTMENT' then ih.qty else 0 end) AS NUMERIC), 3) as adjustment_qty,
-        TRUNC(CAST(sum(case when ih.created_at < $1 then qty else 0 end) AS NUMERIC), 3) as opening_qty,
-        TRUNC(CAST(sum(case when  ih.status = 'MISSING' then -ih.opening_qty else 0 end) AS NUMERIC), 3) as missing_qty,
-        TRUNC(CAST(sum(case when ih.created_at >= $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RELOCATE' then ih.qty else 0 end else 0 end) AS NUMERIC), 3) as total_in_qty,
-        TRUNC(CAST(sum(case when ih.created_at >= $1 then case when ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RELOCATE' then ih.qty else 0 end else 0 end) AS NUMERIC), 3) as total_out_qty,
+        sum(case when ih.created_at >= $1 and ih.transaction_type = 'ADJUSTMENT' then ih.qty else 0 end) as adjustment_qty,
+        sum(case when ih.created_at < $1 then qty else 0 end) as opening_qty,
+        sum(case when  ih.status = 'MISSING' then -ih.opening_qty else 0 end) as missing_qty,
+        sum(case when ih.created_at >= $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RELOCATE' then ih.qty else 0 end else 0 end) as total_in_qty,
+        sum(case when ih.created_at >= $1 then case when ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RELOCATE' then ih.qty else 0 end else 0 end) as total_out_qty,
         ih.product_id
         from temp_inv_history ih
         inner join temp_products prd on prd.id = ih.product_id

package/server/utils/inventory-util.ts

@@ -194,7 +194,7 @@ export async function generateInventoryHistory(
           transactionType,
           qty,
           openingQty: 0,
-          uomValue: Math.trunc(uomValue * 1000) / 1000,
+          uomValue,
           openingUomValue: 0,
           seq: 0
         }
@@ -208,6 +208,7 @@ export async function generateInventoryHistory(
         palletId: inventory.palletId,
         refOrderId: refOrder.id
       })
+
       if (findSameOrderHistory.length > 0) {
         let prevTotalQty = 0
         let prevTotalUomValue = 0
@@ -231,10 +232,10 @@ export async function generateInventoryHistory(
           transactionType,
           qty,
           openingQty: () =>
-            `TRUNC((select opening_qty::numeric from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + (select qty::numeric from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1), 3)`,
-          uomValue: Math.trunc(uomValue * 1000) / 1000,
+            `(select opening_qty from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + (select qty from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1)`,
+          uomValue,
           openingUomValue: () =>
-            `TRUNC((select opening_uom_value::numeric from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + (select uom_value::numeric from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1), 3)`,
+            `(select opening_uom_value from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + (select uom_value from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1)`,
           seq: () =>
             `(select seq from inventory_histories where pallet_id = '${inventory.palletId}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1`
         }