@things-factory/sales-base 4.3.782 → 4.3.784

package/server/service/delivery-order/delivery-order-query.ts

@@ -106,6 +106,69 @@ export class DeliveryOrderQuery {
           x.name != 'orderProductsApi'
       )
 
+      // ── Separate count query (minimal JOINs — only those needed for WHERE conditions) ──
+      const countQb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
+      buildQuery(countQb, params, context)
+
+      if (refNoFilter?.value || refNo2Filter?.value || refNo3Filter?.value || orderInfoFilter?.value || businessRestDayFilter?.value || orderProductsApiFilter?.value) {
+        countQb.leftJoin('do.releaseGood', 'releaseGood')
+      }
+      if (businessRestDayFilter?.value) {
+        countQb.leftJoin('releaseGood.deliverTo', 'deliverTo')
+      }
+      if (orderProductsApiFilter?.value) {
+        countQb.innerJoin('releaseGood.orderProducts', 'orderProducts')
+      }
+
+      if (refNoFilter?.value) {
+        countQb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value })
+      }
+      if (refNo2Filter?.value) {
+        countQb.andWhere('releaseGood.ref_no_2 ilike :refNo2', { refNo2: refNo2Filter.value })
+      }
+      if (refNo3Filter?.value) {
+        countQb.andWhere('releaseGood.ref_no_3 ilike :refNo3', { refNo3: refNo3Filter.value })
+      }
+      if (orderInfoFilter?.value) {
+        let removeSymbolCount = orderInfoFilter.value
+          .split('')
+          .filter(res => res !== '%')
+          .join('')
+        let orderInfosCount = removeSymbolCount
+          .toLowerCase()
+          .split(',')
+          .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+        countQb.andWhere(
+          `(
+          lower(releaseGood.name) like any(array[${orderInfosCount}])
+          or lower(releaseGood.ref_no) like any(array[${orderInfosCount}])
+          or lower(releaseGood.ref_no_2) like any(array[${orderInfosCount}])
+          or lower(releaseGood.ref_no_3) like any(array[${orderInfosCount}])
+          )`
+        )
+      }
+      if (businessRestDayFilter?.value) {
+        const todayCount = new Date()
+        const dayOfWeekCount = todayCount.getDay()
+        const dayNamesCount = ['SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY']
+        const currentDayNameCount = dayNamesCount[dayOfWeekCount]
+        if (businessRestDayFilter.value === 'within') {
+          countQb.andWhere(`deliverTo.business_rest_day IS NOT NULL AND deliverTo.business_rest_day ILIKE :currentDay`, {
+            currentDay: `%${currentDayNameCount}%`
+          })
+        } else if (businessRestDayFilter.value === 'not_within') {
+          countQb.andWhere(`(deliverTo.business_rest_day IS NULL OR deliverTo.business_rest_day NOT ILIKE :currentDay)`, {
+            currentDay: `%${currentDayNameCount}%`
+          })
+        }
+      }
+
+      const total: number = await countQb.getCount()
+
+      // ── Data query (full JOINs for SELECT — paginated, only processes 'limit' rows) ──
       const qb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
       buildQuery(qb, params, context)
       qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
@@ -206,7 +269,7 @@ export class DeliveryOrderQuery {
 
       qb.orderBy(sort)
 
-      let [items, total] = await qb.getManyAndCount()
+      let items = await qb.getMany()
 
       items = items.map(itm => {
         let refNo2 = itm.refNo2 // default
@@ -296,7 +359,8 @@ export class DeliveryOrderQuery {
     }
     convertedParams.bizplace = In(await getPermittedBizplaceIds(domain, user))
 
-    const [items, total] = await getRepository(DeliveryOrder).findAndCount({
+    const total = await getRepository(DeliveryOrder).count(convertedParams)
+    const items = await getRepository(DeliveryOrder).find({
       ...convertedParams,
       relations: ['domain', 'bizplace', 'releaseGood', 'transportDriver', 'transportVehicle', 'creator', 'updater']
     })
@@ -580,6 +644,26 @@ export class DeliveryOrderQuery {
 
       params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3')
 
+      // ── Separate count query (minimal JOINs — only those needed for WHERE conditions) ──
+      const countQb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
+      buildQuery(countQb, params, context)
+
+      if (refNoFilter?.value || refNo2Filter?.value || refNo3Filter?.value) {
+        countQb.leftJoin('do.releaseGood', 'releaseGood')
+      }
+      if (refNoFilter?.value) {
+        countQb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value })
+      }
+      if (refNo2Filter?.value) {
+        countQb.andWhere('releaseGood.ref_no_2 ilike :refNo2', { refNo2: refNo2Filter.value })
+      }
+      if (refNo3Filter?.value) {
+        countQb.andWhere('releaseGood.ref_no_3 ilike :refNo3', { refNo3: refNo3Filter.value })
+      }
+
+      const total: number = await countQb.getCount()
+
+      // ── Data query (full JOINs for SELECT — paginated, only processes 'limit' rows) ──
       const qb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
       buildQuery(qb, params, context)
       qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
@@ -634,7 +718,7 @@ export class DeliveryOrderQuery {
 
       qb.orderBy(sort)
 
-      const [items, total] = await qb.getManyAndCount()
+      const items = await qb.getMany()
       return { items, total }
     } catch (error) {
       debug('deliveryOrders', error.toString())
@@ -662,7 +746,8 @@ export async function deliveryOrderByReleaseGood(releaseGood: ReleaseGood, trxMg
   const doRepo: Repository<DeliveryOrder> = trxMgr?.getRepository(DeliveryOrder) || getRepository(DeliveryOrder)
   const oiRepo: Repository<OrderInventory> = trxMgr?.getRepository(OrderInventory) || getRepository(OrderInventory)
 
-  let [items, total] = await doRepo.findAndCount({
+  const total = await doRepo.count({ where: { releaseGood } })
+  let items = await doRepo.find({
     where: { releaseGood },
     relations: ['domain', 'bizplace', 'releaseGood', 'transportDriver', 'transportVehicle', 'creator', 'updater']
   })

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

@@ -128,6 +128,8 @@ export class ReleaseGoodMutation {
     let releaseGoods: Partial<ReleaseGood[]> = extractRawReleaseGoods(rawReleaseGoods)
 
     let errorsCaught: any[] = []
+    let successCaught: string[] = []
+    let failedCaught: string[] = []
     for (let i = 0, l = releaseGoods.length; i < l; i++) {
       // generate release good by group to avoid duplication
       // if this function is called simultaneously by different users
@@ -172,9 +174,31 @@ export class ReleaseGoodMutation {
 
           createdReleaseGoods.push(createdReleaseGood)
         })
+        // track successfully created order labels for toast message
+        const rg = releaseGoods[i] as any
+        const label = rg.refNo2 ? `${rg.refNo} / ${rg.refNo2}` : rg.refNo
+        successCaught.push(label)
       } catch (error) {
-        let rawReleaseGoods = formRawReleaseGoods(releaseGoods[i], error.message)
-        errorsCaught.push(...rawReleaseGoods)
+        // track failed order labels for toast message
+        const failedRg = releaseGoods[i] as any
+        const failedLabel = failedRg.refNo2 ? `${failedRg.refNo} / ${failedRg.refNo2}` : failedRg.refNo
+        failedCaught.push(failedLabel)
+        // for insufficient stock errors, use per-item error messages from availableItems
+        if (error?.detail?.data) {
+          try {
+            const perItemData: any[] = JSON.parse(error.detail.data)
+            const flatRows = perItemData.map((item: any) => {
+              const row = { ...releaseGoods[i], ...item, errorMsg: item.errorMsg || error.message }
+              delete row.orderInventories
+              return row
+            })
+            errorsCaught.push(...flatRows)
+          } catch {
+            errorsCaught.push(...formRawReleaseGoods(releaseGoods[i], error.message))
+          }
+        } else {
+          errorsCaught.push(...formRawReleaseGoods(releaseGoods[i], error.message))
+        }
       }
     }
 
@@ -218,7 +242,7 @@ export class ReleaseGoodMutation {
     if (errorsCaught.length)
       throw new ValidationError({
         ...ValidationError.ERROR_CODES.INVALID_DATA_FOUND,
-        detail: { data: JSON.stringify(errorsCaught) }
+        detail: { data: JSON.stringify(errorsCaught), successOrders: successCaught, failedOrders: failedCaught }
       })
 
     return confirmedReleaseGoods
@@ -2164,7 +2188,14 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
 
     if (idx >= 0) {
       const duplicateSkuIdx: number = releaseGoods[idx].orderInventories.findIndex(
-        oi => oi.sku === item.sku && oi.packingType === item.packingType && oi.packingSize === item.packingSize
+        oi =>
+          oi.sku === item.sku &&
+          oi.packingType === item.packingType &&
+          oi.packingSize === item.packingSize &&
+          oi.uom === item.uom &&
+          oi.batchId === item.batchId &&
+          oi.cartonId === item.cartonId &&
+          oi.expirationDate === item.expirationDate
       )
 
       // if there is duplicated SKU, merge them and sum up the releaseQty
@@ -2182,7 +2213,10 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
           packingSize: item.packingSize,
           uom: item.uom,
           releaseQty: Math.round(parseFloat(item.releaseQty) * 1000) / 1000,
-          releaseUomValue: Math.round(parseFloat(item.releaseUomValue) * 1000) / 1000
+          releaseUomValue: Math.round(parseFloat(item.releaseUomValue) * 1000) / 1000,
+          batchId: item?.batchId || null,
+          cartonId: item?.cartonId || null,
+          expirationDate: item?.expirationDate || null
         })
       }
     } else {

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

@@ -1097,22 +1097,24 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
           ${useDetailedQuery ? ' i.batch_id, i.carton_id, i.expiration_date,' : ''}
           SUM(i.qty - COALESCE(i.locked_qty, 0)) - COALESCE(
             (
-              SELECT SUM(oi.release_qty) FROM order_inventories oi 
+              SELECT SUM(oi.release_qty) FROM order_inventories oi
               WHERE oi.status IN ('PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'PENDING_SPLIT')
               AND oi.inventory_id IS null
               AND oi.product_id = i.product_id::uuid
               AND oi.packing_type = i.packing_type
+              AND oi.packing_size = i.packing_size
               AND oi.uom = i.uom
               AND oi.domain_id = $1
               AND oi.bizplace_id = $2
             ), 0) as "remain_qty",
           SUM(i.uom_value - COALESCE(i.locked_uom_value, 0)) - COALESCE(
             (
-              SELECT SUM(oi.release_uom_value) FROM order_inventories oi 
+              SELECT SUM(oi.release_uom_value) FROM order_inventories oi
               WHERE oi.status IN ('PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'PENDING_SPLIT')
               AND oi.inventory_id IS null
               AND oi.product_id = i.product_id::uuid
               AND oi.packing_type = i.packing_type
+              AND oi.packing_size = i.packing_size
               AND oi.uom = i.uom
               AND oi.domain_id = $1
               AND oi.bizplace_id = $2
@@ -1240,7 +1242,6 @@ function _extractData(rawData, validatedData) {
 
       return val.sku.toLowerCase() == raw.sku.toLowerCase() && a === b
     })
-
     let releaseUomValue = 0
 
     // if sku is matched, assign qty and product id