@things-factory/sales-base 4.3.677 → 4.3.679

package/server/service/draft-release-good/draft-release-good-create.ts

@@ -1,53 +1,19 @@
-import {
-  Arg,
-  Ctx,
-  Directive,
-  Mutation,
-  Resolver
-} from 'type-graphql'
-import {
-  EntityManager,
-  getConnection,
-  getRepository,
-  In,
-  Repository
-} from 'typeorm'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { EntityManager, getConnection, getRepository, In, Repository } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
-import {
-  WebhookEventsEnum,
-  webhookHandler
-} from '@things-factory/integration-base'
+import { WebhookEventsEnum, webhookHandler } from '@things-factory/integration-base'
 import { ProductBundle } from '@things-factory/product-base'
-import {
-  PartnerSetting,
-  Setting
-} from '@things-factory/setting-base'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
-import {
-  bulkReleaseGoodsAvailableItemsFunction,
-  DraftReleaseGood,
-  DraftReleaseGoodInfos,
-  OrderProduct
-} from '../'
-import {
-  DRAFT_RELEASE_ORDER_STATUS,
-  ORDER_NUMBER_SETTING_KEY,
-  ORDER_STATUS
-} from '../../constants'
+import { bulkReleaseGoodsAvailableItemsFunction, DraftReleaseGood, DraftReleaseGoodInfos, OrderProduct } from '../'
+import { DRAFT_RELEASE_ORDER_STATUS, ORDER_NUMBER_SETTING_KEY, ORDER_STATUS } from '../../constants'
 import { ValidationError } from '../../errors'
-import {
-  InventoryUtil,
-  OrderNoGenerator
-} from '../../utils'
+import { InventoryUtil, OrderNoGenerator } from '../../utils'
 import { ReleaseGood } from '../release-good/release-good'
-import {
-  bulkGenerateReleaseGood,
-  confirmReleaseGood,
-  receiveReleaseGood
-} from '../release-good/release-good-mutation'
+import { bulkGenerateReleaseGood, confirmReleaseGood, receiveReleaseGood } from '../release-good/release-good-mutation'
 import { SuccessReleasedDraftOrder } from './draft-release-good-type'
 
 @Resolver(DraftReleaseGood)
@@ -171,18 +137,42 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
               }
             }
 
-            let productInventory = await InventoryUtil.bizplaceProductInventory(
-              bizplaces,
+            // Derive common warehouseCode across lines (if any) and collect batchIds
+            const warehouseCodes = Array.from(
+              new Set(
+                draftOrder.orderProducts
+                  .map((op: any) => (op?.warehouseCode ? String(op.warehouseCode).trim() : ''))
+                  .filter(Boolean)
+              )
+            )
+            const commonWarehouseCode = warehouseCodes.length === 1 ? warehouseCodes[0] : undefined
+            const batchIds = Array.from(
+              new Set(
+                draftOrder.orderProducts
+                  .map((op: any) => (op?.batchId ? String(op.batchId).trim() : ''))
+                  .filter(Boolean)
+              )
+            )
+
+            const filters: any[] = [
               {
-                filters: [
-                  {
-                    name: 'productId',
-                    operator: 'in',
-                    value: productIds
-                  },
-                  { name: 'deleted_at', operator: 'eq', value: true }
-                ]
+                name: 'productId',
+                operator: 'in',
+                value: productIds
               },
+              { name: 'deleted_at', operator: 'eq', value: true }
+            ]
+
+            if (commonWarehouseCode) {
+              filters.push({ name: 'warehouseCode', operator: 'eq', value: commonWarehouseCode })
+              if (batchIds.length > 0) {
+                filters.push({ name: 'batchId', operator: 'in', value: batchIds })
+              }
+            }
+
+            let productInventory = await InventoryUtil.bizplaceProductInventory(
+              bizplaces,
+              { filters },
               context,
               innerTx1
             )
@@ -268,7 +258,12 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
                       releaseQty: itm.releaseQty,
                       assignedQty: undefined,
                       assignedUomValue: undefined,
-                      releaseUomValue: itm.releaseUomValue
+                      releaseUomValue: itm.releaseUomValue,
+                      refNo: draftOrder.refNo || '',
+                      releaseDate: draftOrder.releaseDate || null,
+                      // propagate filters to availability function
+                      batchId: itm?.batchId || null,
+                      warehouseCode: itm?.warehouseCode ? String(itm.warehouseCode).trim() : null
                     }
                   ]
                 }
@@ -631,7 +626,12 @@ export async function generatePartialReleaseGoods(_generatePartialReleaseGoodsRe
                       releaseQty: itm.releaseQty,
                       assignedQty: undefined,
                       assignedUomValue: undefined,
-                      releaseUomValue: itm.releaseUomValue
+                      releaseUomValue: itm.releaseUomValue,
+                      refNo: draftOrder.refNo || '',
+                      releaseDate: draftOrder.releaseDate || null,
+                      // propagate filters to availability function
+                      batchId: itm?.batchId || null,
+                      warehouseCode: itm?.warehouseCode ? String(itm.warehouseCode).trim() : null
                     }
                   ]
                 }

package/server/service/draft-release-good/draft-release-good-mutation.ts

@@ -499,7 +499,8 @@ export async function upsertDraftReleaseGoodProducts(
           ...existingOP,
           ...op,
           domain,
-          batchId: '',
+          // Preserve batchId for product lines; bundles must not carry batchId
+          batchId: op?.warehouseCode ? (op?.batchId ? String(op.batchId).trim() : existingOP?.batchId || '') : '',
           packQty: 0,
           actualPackQty: 0,
           palletQty: 0,

package/server/service/draft-release-good/draft-release-good-query.ts

@@ -271,35 +271,62 @@ export async function getDraftReleaseGoodFunction(_: any, context: any, id?: any
     const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
 
     let productInventory
-    if (result.orderProducts.length > 0)
+    if (result.orderProducts.length > 0) {
+      // derive common warehouseCode (assumed same across all orderProducts when provided)
+      const warehouseCodes = Array.from(
+        new Set(
+          result.orderProducts
+            .map((op: any) => (op?.warehouseCode ? String(op.warehouseCode).trim() : ''))
+            .filter(Boolean)
+        )
+      )
+
+      const commonWarehouseCode = warehouseCodes.length === 1 ? warehouseCodes[0] : undefined
+
+      // collect batchIds (may be different per op)
+      const batchIds = Array.from(
+        new Set(result.orderProducts.map((op: any) => (op?.batchId ? String(op.batchId).trim() : '')).filter(Boolean))
+      )
+
+      const baseFilters: any[] = [
+        { name: 'bizplaceId', operator: 'eq', value: result.bizplace.id },
+        {
+          name: 'productId',
+          operator: 'in',
+          value: [
+            ...result.orderProducts
+              .filter(itm => itm?.product)
+              .map(itm => {
+                return itm.product.id
+              }),
+            ...result.orderProducts
+              .filter(itm => itm?.productBundle)
+              .map(itm => {
+                return itm.productBundle.productBundleSettings.map(itm => {
+                  return itm.product.id
+                })
+              })
+          ]
+        }
+      ]
+
+      if (commonWarehouseCode) {
+        baseFilters.push({ name: 'warehouseCode', operator: 'eq', value: commonWarehouseCode })
+      }
+
+      if (batchIds.length > 0) {
+        baseFilters.push({ name: 'batchId', operator: 'in', value: batchIds })
+      }
+
       productInventory = await InventoryUtil.bizplaceProductInventory(
         bizplaces,
         {
-          filters: [
-            { name: 'bizplaceId', operator: 'eq', value: result.bizplace.id },
-            {
-              name: 'productId',
-              operator: 'in',
-              value: [
-                ...result.orderProducts
-                  .filter(itm => itm?.product)
-                  .map(itm => {
-                    return itm.product.id
-                  }),
-                ...result.orderProducts
-                  .filter(itm => itm?.productBundle)
-                  .map(itm => {
-                    return itm.productBundle.productBundleSettings.map(itm => {
-                      return itm.product.id
-                    })
-                  })
-              ]
-            }
-          ]
+          filters: baseFilters
         },
         context,
         tx
       )
+    }
 
     result.orderProducts = result.orderProducts
       .map(itm => {
@@ -321,6 +348,7 @@ export async function getDraftReleaseGoodFunction(_: any, context: any, id?: any
             productDetail: itm.productDetail || {
               id: foundProductInv.productDetailId
             },
+            batchId: itm.batchId,
             groupType: foundProductInv ? foundProductInv.groupType : 'SINGLE',
             remainQty: foundProductInv ? foundProductInv.remainQty : 0,
             remainUomValue: foundProductInv ? foundProductInv.remainUomValue : 0,
@@ -352,6 +380,7 @@ export async function getDraftReleaseGoodFunction(_: any, context: any, id?: any
                 id: foundProductInv.productDetailId
               },
               groupType: 'BUNDLE',
+              batchId: itm.batchId,
               releaseQty: itmBundleReleaseQty,
               remainQty: foundProductInv ? foundProductInv.remainQty : 0,
               remainUomValue: foundProductInv ? foundProductInv.remainUomValue : 0,

package/server/service/order-product/order-product.ts

@@ -243,7 +243,7 @@ export class OrderProduct {
   expDate: Date
 
   @Column('date', { nullable: true })
-  @Field( type => ScalarDate, { nullable: true })
+  @Field(type => ScalarDate, { nullable: true })
   adjustedExpDate: Date
 
   @ManyToOne(type => Warehouse, { nullable: true })
@@ -253,13 +253,13 @@ export class OrderProduct {
   @RelationId((orderProduct: OrderProduct) => orderProduct.warehouse)
   warehouseId: string
 
-  @ManyToOne(type=> Warehouse, { nullable: true })
-  @Field(type=> Warehouse, { nullable: true })
+  @ManyToOne(type => Warehouse, { nullable: true })
+  @Field(type => Warehouse, { nullable: true })
   adjustedWarehouse: Warehouse
 
   @RelationId((orderProduct: OrderProduct) => orderProduct.adjustedWarehouse)
   adjustedWarehouseId: string
-  
+
   @ManyToOne(type => Location, { nullable: true })
   @Field(type => Location, { nullable: true })
   location: Location
@@ -458,6 +458,10 @@ export class OrderProduct {
   @Field({ nullable: true })
   remark: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  warehouseCode: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   issue: string

package/server/service/release-good/release-good-query.ts

@@ -951,6 +951,15 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
   const companyBizplaceId: Bizplace = await getCompanyBizplace(null, null, bizplaceId)
 
   if (!rawReleaseGoods) return
+  // derive optional filters
+  const uniqueWarehouseCodes: string[] = Array.from(
+    new Set(
+      (rawReleaseGoods || []).map((r: any) => (r?.warehouseCode ? String(r.warehouseCode).trim() : '')).filter(Boolean)
+    )
+  )
+  const uniqueBatchIds: string[] = Array.from(
+    new Set((rawReleaseGoods || []).map((r: any) => (r?.batchId ? String(r.batchId).trim() : '')).filter(Boolean))
+  )
   const json_oi = JSON.stringify(
     rawReleaseGoods.map(raw => {
       return {
@@ -1009,6 +1018,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
     `
       WITH inv AS (
         SELECT i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom,
+          w.name as warehouse_name,
           ${useDetailedQuery ? ' i.batch_id, i.carton_id, i.expiration_date,' : ''}
           SUM(i.qty - COALESCE(i.locked_qty, 0)) - COALESCE(
             (
@@ -1035,6 +1045,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
           p.is_inventory_decimal
         FROM inventories i
         INNER JOIN locations l ON i.location_id = l.id
+        INNER JOIN warehouses w ON w.id = l.warehouse_id
         LEFT JOIN products p ON i.product_id = p.id
         INNER JOIN (
           SELECT rrg.product_id, rrg.product_detail_id, rrg.sku, rrg.product_info, rrg.packing_type, rrg.packing_size, rrg.uom 
@@ -1052,12 +1063,21 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         AND i.obsolete = false
         AND i.transfer_qty <= 0
         AND i.transfer_uom_value <= 0
-        GROUP BY i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom, p.is_inventory_decimal
+        AND ( $5::text IS NULL OR w.name = $5 )
+        ${`AND ( $6::text IS NULL OR i.batch_id = $6 )`}
+        GROUP BY i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom, p.is_inventory_decimal, w.name
         ${useDetailedQuery ? ', i.batch_id, i.carton_id, i.expiration_date' : ''}
         ORDER BY foo.sku, remain_qty DESC
       ) SELECT * FROM inv WHERE remain_qty > 0
       `,
-    [domain.id, bizplaceId, LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+    [
+      domain.id,
+      bizplaceId,
+      LOCATION_TYPE.QUARANTINE,
+      LOCATION_TYPE.RESERVE,
+      uniqueWarehouseCodes.length === 1 ? uniqueWarehouseCodes[0] : null,
+      uniqueBatchIds.length === 1 ? uniqueBatchIds[0] : null
+    ]
   )
 
   await tx.query(`DROP TABLE raw_release_goods`)
@@ -1073,6 +1093,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       uom: item.uom,
       remainQty: item.remain_qty,
       remainUomValue: item.remain_uom_value,
+      warehouseCode: item.warehouse_name || null,
       batchId: item.batch_id ? item.batch_id : null,
       cartonId: item.carton_id ? item.carton_id : null,
       expirationDate: item.expiration_date ? _getStdDateStr(new Date(item.expiration_date)) : null,
@@ -1096,6 +1117,11 @@ function _extractData(rawData, validatedData) {
       comparison.push('batchId')
       if (!data.length) errMsg = errMsg ? errMsg : 'batch no not matched'
     }
+    if (raw.warehouseCode) {
+      data = data.filter(val => val.warehouseCode === String(raw.warehouseCode).trim())
+      comparison.push('warehouseCode')
+      if (!data.length) errMsg = errMsg ? errMsg : 'warehouse code not matched'
+    }
     if (raw.cartonId) {
       data = data.filter(val => val.cartonId === raw.cartonId)
       comparison.push('cartonId')
@@ -1133,20 +1159,17 @@ function _extractData(rawData, validatedData) {
 
       raw.assignedQty =
         Math.round(
-          (data[idx].remainQty >= raw.releaseQty
-        ? raw.releaseQty > 0
-          ? raw.releaseQty
-          : 0
-        : data[idx].remainQty) * 1000
+          (data[idx].remainQty >= raw.releaseQty ? (raw.releaseQty > 0 ? raw.releaseQty : 0) : data[idx].remainQty) *
+            1000
         ) / 1000
 
       raw.assignedUomValue =
         Math.round(
           (data[idx].remainUomValue >= releaseUomValue
-        ? releaseUomValue > 0
-          ? releaseUomValue
-          : 0
-        : data[idx].remainUomValue) * 1000
+            ? releaseUomValue > 0
+              ? releaseUomValue
+              : 0
+            : data[idx].remainUomValue) * 1000
         ) / 1000
 
       // deduct qty & uomValue from validateData
@@ -1190,7 +1213,7 @@ function _extractData(rawData, validatedData) {
           errors.push('insufficient stock')
         }
         if (!dateRegex.test(raw.releaseDate)) {
-          errors.push('invalid release date format. please use dd/mm/yyyy')
+          errors.push('invalid release date format. please use yyyy-mm-dd')
         }
         if (raw.releaseDate === '') {
           errors.push('release date is empty')
@@ -1213,7 +1236,7 @@ function _extractData(rawData, validatedData) {
             errors.push('invalid paid amount')
           }
           if (raw?.expirationDate != null && !dateRegex.test(raw?.expirationDate)) {
-            errors.push('invalid expiration date format. please use dd/mm/yyyy')
+            errors.push('invalid expiration date format. please use yyyy-mm-dd')
           }
           if (raw.airwayBill && raw.lmdOption === true) {
             errors.push('kindly remove AWB as LMD is marked as true')

package/server/utils/inventory-util.ts

@@ -59,6 +59,25 @@ export const InventoryUtil = {
       let inventoryBizplaceFilter = filters.find(itm => itm.name == 'bizplaceId')
       let deletedAt = filters.find(filter => filter.name == 'deleted_at')
 
+      const warehouseCodeFilter = filters.find(itm => itm.name == 'warehouseCode')
+      const batchIdFilter = filters.find(itm => itm.name == 'batchId')
+      const sanitizedWarehouseCode = warehouseCodeFilter
+        ? String(warehouseCodeFilter.value).trim().replace(/'/g, "''")
+        : null
+
+      let batchFilterClause = ''
+      // Apply strict batch filter only when warehouseCode is provided
+      if (sanitizedWarehouseCode && batchIdFilter) {
+        const op = (batchIdFilter.operator || '').toLowerCase()
+        const val = batchIdFilter.value
+        if (op === 'in' && Array.isArray(val)) {
+          const list = val.map(v => `'${String(v).trim().replace(/'/g, "''")}'`).join(',')
+          batchFilterClause = `AND i.batch_id IN (${list})`
+        } else if (val !== undefined && val !== null && String(val).trim() !== '') {
+          batchFilterClause = `AND i.batch_id = '${String(val).trim().replace(/'/g, "''")}'`
+        }
+      }
+
       let queryStrings = `
         CREATE TEMP TABLE temp_inventory_product_group ON COMMIT DROP AS (
           SELECT * FROM (
@@ -125,12 +144,15 @@ export const InventoryUtil = {
             LEFT JOIN (
               SELECT i.* FROM inventories i 
               INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id
+              INNER JOIN warehouses w ON w.id = l2.warehouse_id
               WHERE l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}', '${
         LOCATION_TYPE.DAMAGE
       }')
               AND i.obsolete = false
               AND i.domain_id = $1 AND i.status = 'STORED'
               ${inventoryBizplaceFilter ? `AND i.bizplace_id = '${inventoryBizplaceFilter.value}'` : ``}
+              ${sanitizedWarehouseCode ? `AND w.name = '${sanitizedWarehouseCode}'` : ``}
+              ${batchFilterClause}
             ) i ON i.product_detail_id = pd.id
             LEFT JOIN oi ON i.batch_id = oi.batch_id AND p.name = oi.product_name AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
             LEFT JOIN (
@@ -189,12 +211,14 @@ export const InventoryUtil = {
               LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id AND i2.domain_id = $1 AND i2.status = 'STORED'
               LEFT JOIN product_detail_stocks pds2 ON pds2.product_detail_id = pbs.product_detail_id
               INNER JOIN locations l2 ON i2.location_id = l2.id                
+              INNER JOIN warehouses w2 ON w2.id = l2.warehouse_id
               LEFT JOIN oi ON oi.product_id = i2.product_id
               WHERE l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}', '${
         LOCATION_TYPE.DAMAGE
       }')
               and i2.obsolete = false
               ${inventoryBizplaceFilter ? `AND i2.bizplace_id = '${inventoryBizplaceFilter.value}'` : ``}
+              ${sanitizedWarehouseCode ? `AND w2.name = '${sanitizedWarehouseCode}'` : ``}
               GROUP BY 
                 pbs.product_id, 
                 pbs.product_bundle_id,
@@ -848,7 +872,8 @@ export const InventoryUtil = {
     preferLocation: string = null,
     recall: boolean = null,
     cartonId?: string,
-    expirationDate?: Date
+    expirationDate?: Date,
+    warehouseName?: string
   ): Promise<OrderInventory[]> {
     let strictProduct = 'false'
 
@@ -880,6 +905,7 @@ export const InventoryUtil = {
 
     let qb: SelectQueryBuilder<Inventory> = trxMgr.getRepository(Inventory).createQueryBuilder('iv')
     qb.innerJoinAndSelect('iv.location', 'loc')
+      .innerJoin('warehouses', 'w', 'w.id = loc.warehouse_id')
       .innerJoin('warehouse_inventory_assignment_rankings', 'wiar', '"wiar"."location_type" = "loc"."type"')
       .innerJoin('iv.product', 'p')
       .andWhere('"iv"."domain_id" = :domainId')
@@ -917,6 +943,9 @@ export const InventoryUtil = {
     if (preferLocation) {
       qb.andWhere('"loc"."type" = :preferLocation', { preferLocation })
     }
+    if (warehouseName) {
+      qb.andWhere('w.name = :warehouseName', { warehouseName: String(warehouseName).trim() })
+    }
     if (strictProduct == 'true' || preferLocation == 'STORAGE') {
       qb.andWhere('"iv"."product_detail_id" = :productDetailId', { productDetailId: productDetail.id })
     } else {
@@ -1075,8 +1104,17 @@ async function getConditions(
             break
 
           case 'batchId':
-            let batchId = `${value}`
-            whereClause += `AND LOWER("batchId") LIKE '${batchId.replace(`'`, `''`).toLowerCase()}'`
+            // Only apply to outer whereClause when the consumer's temp table includes "batchId"
+            if (hasRemainingQty) {
+              if (operator === 'in' && Array.isArray(value)) {
+                const list = value.map((v: string) => `'${String(v).trim().replace(/'/g, "''")}'`).join(',')
+                whereClause += `AND "batchId" IN (${list})`
+              } else {
+                let batchId = `${value}`
+                whereClause += `AND LOWER("batchId") LIKE '${batchId.replace(`'`, `''`).toLowerCase()}'`
+              }
+            }
+            // For consumers without batchId column (e.g., bizplaceProductInventory), batch filtering is handled inside subqueries
             break
 
           case 'batchIdRef':