@things-factory/sales-base 4.3.638 → 4.3.642

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

@@ -1,62 +1,20 @@
-import {
-  Arg,
-  Args,
-  Ctx,
-  Directive,
-  FieldResolver,
-  Query,
-  Resolver,
-  Root
-} from 'type-graphql'
-import {
-  EntityManager,
-  getRepository,
-  In,
-  Repository,
-  SelectQueryBuilder
-} from 'typeorm'
+import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { EntityManager, getRepository, In, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
-import {
-  checkUserBelongsDomain,
-  User
-} from '@things-factory/auth-base'
-import {
-  Bizplace,
-  getCompanyBizplace,
-  getMyBizplace,
-  getPermittedBizplaceIds
-} from '@things-factory/biz-base'
+import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
+import { Bizplace, getCompanyBizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
-import {
-  buildQuery,
-  Domain,
-  Filter,
-  ListParam,
-  Pagination,
-  Sorting
-} from '@things-factory/shell'
-import {
-  Inventory,
-  LOCATION_TYPE
-} from '@things-factory/warehouse-base'
-
-import {
-  ATTACHMENT_TYPE,
-  ORDER_INVENTORY_STATUS,
-  ORDER_STATUS,
-  ORDER_VAS_STATUS
-} from '../../constants'
+import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
+import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
+
+import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS, ORDER_VAS_STATUS } from '../../constants'
 import { convertExcelDateToISO } from '../../utils/datetime-util'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderPackage } from '../order-package/order-package'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ReleaseGood } from './release-good'
-import {
-  NewReleaseGood,
-  ReleasableInventoryList,
-  ReleaseGoodList
-} from './release-good-types'
+import { NewReleaseGood, ReleasableInventoryList, ReleaseGoodList } from './release-good-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodQuery {
@@ -520,9 +478,9 @@ export class ReleaseGoodQuery {
         params.filters.splice(fromDateParamIdx, 1)
 
         params.filters.push({
-          name: (typeFilter == 'b2c' || isReleaseDateSearch.value) ? 'releaseDate' : 'createdAt',
+          name: typeFilter == 'b2c' || isReleaseDateSearch.value ? 'releaseDate' : 'createdAt',
           operator: 'gte',
-          value: (typeFilter == 'b2c' || isReleaseDateSearch.value) ? releaseDateFrom : fromDateVal.toISOString(),
+          value: typeFilter == 'b2c' || isReleaseDateSearch.value ? releaseDateFrom : fromDateVal.toISOString(),
           relation: false
         })
       }
@@ -534,15 +492,21 @@ export class ReleaseGoodQuery {
         params.filters.splice(toDateParamIdx, 1)
 
         params.filters.push({
-          name: (typeFilter == 'b2c' || isReleaseDateSearch.value) ? 'releaseDate' : 'createdAt',
-          operator: (typeFilter == 'b2c' || isReleaseDateSearch.value) ? 'lte' : 'lt',
+          name: typeFilter == 'b2c' || isReleaseDateSearch.value ? 'releaseDate' : 'createdAt',
+          operator: typeFilter == 'b2c' || isReleaseDateSearch.value ? 'lte' : 'lt',
           value:
-            (typeFilter == 'b2c' || isReleaseDateSearch.value) ? releaseDateTo : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+            typeFilter == 'b2c' || isReleaseDateSearch.value
+              ? releaseDateTo
+              : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
           relation: false
         })
       }
 
-      if (!!isReleaseDateSearch) params.filters.splice(params.filters.findIndex(param => param.name == 'isReleaseDateSearch'), 1)
+      if (!!isReleaseDateSearch)
+        params.filters.splice(
+          params.filters.findIndex(param => param.name == 'isReleaseDateSearch'),
+          1
+        )
 
       if (noOfItemsFilter && noOfItemsFilter.value == 1) {
         params.filters.find(param => param.name === 'noOfItems').operator = 'eq'
@@ -559,6 +523,7 @@ export class ReleaseGoodQuery {
       qb.leftJoinAndSelect('rg.updater', 'updater')
       qb.leftJoinAndSelect('rg.acceptedBy', 'acceptedBy')
       qb.leftJoinAndSelect('rg.draftReleaseGood', 'draftReleaseGood')
+      qb.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
       qb.leftJoinAndSelect('rg.deliverTo', 'deliverTo')
       qb.leftJoinAndSelect('rg.orderVass', 'ov')
       qb.leftJoin(
@@ -577,13 +542,9 @@ export class ReleaseGoodQuery {
 
       if (hasVas) {
         if (hasVas.value == true) {
-          qb.andWhere(
-            `ov.release_good_id notnull`
-          )
+          qb.andWhere(`ov.release_good_id notnull`)
         } else if (hasVas.value == false && !vasStatusFilter) {
-          qb.andWhere(
-            `ov.release_good_id is null`
-          )
+          qb.andWhere(`ov.release_good_id is null`)
         }
       }
 
@@ -601,7 +562,8 @@ export class ReleaseGoodQuery {
                     release_goods rg2
                   LEFT JOIN order_vass ov2 on ov2.release_good_id = rg2.id
                   WHERE ov2.status = 'PENDING_APPROVE'
-                )`, { vasStatus: vasStatusFilter.value}
+                )`,
+            { vasStatus: vasStatusFilter.value }
           )
         }
       }
@@ -713,17 +675,26 @@ export class ReleaseGoodQuery {
                 newPlatformCode = 'Shopify'
               }
             }
+
+            if (
+              item.lastMileDelivery &&
+              item.lastMileDelivery.isTms &&
+              item.lastMileDelivery.platform === 'VERSA_FLEET'
+            ) {
+              item.refNo2 = item.vehicleNo ? item.vehicleNo : item.refNo2
+            }
+
             return {
               ...item,
               platformCode: newPlatformCode ? newPlatformCode : item.platformCode,
               transporter: orderPackages?.length
                 ? [
-                  ...new Set(
-                    orderPackages.map(op => {
-                      return op.transporter
-                    })
-                  )
-                ].join(', ')
+                    ...new Set(
+                      orderPackages.map(op => {
+                        return op.transporter
+                      })
+                    )
+                  ].join(', ')
                 : null,
               orderRemark: item?.remark ? true : false
             }
@@ -789,24 +760,27 @@ export class ReleaseGoodQuery {
         ${batchId ? `AND LOWER(${INV_ALIAS}.batch_id) LIKE '%${batchId.toLowerCase()}%'` : ''}
         ${packingType ? `AND LOWER(${INV_ALIAS}.packing_type) LIKE '%${packingType.toLowerCase()}%'` : ''}
         ${containerNo ? `AND LOWER(${GAN_ALIAS}.container_no) LIKE '%${containerNo.toLowerCase()}%'` : ''}
-        ${product?.length > 0 && product[0]
-        ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
-        : product[0] === null
-          ? `AND ${PROD_ALIAS}.id isnull`
-          : ''
-      }
-        ${inventory?.length > 0
-        ? `
-              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
-          .operator
-        } (
+        ${
+          product?.length > 0 && product[0]
+            ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
+            : product[0] === null
+            ? `AND ${PROD_ALIAS}.id isnull`
+            : ''
+        }
+        ${
+          inventory?.length > 0
+            ? `
+              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${
+                filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
+                  .operator
+              } (
                 ${inventory
-          .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
-          .join(', ')}
+                  .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
+                  .join(', ')}
               )
             `
-        : ''
-      }
+            : ''
+        }
     `
 
     // ${product?.length > 0 ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => id ? `'${id}'` : null).join(', ')})` : ''}
@@ -996,7 +970,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
           packing_type VARCHAR(50),
           packing_size FLOAT,
           uom VARCHAR(10),
-          release_qty INT
+          release_qty NUMERIC(15,3)
         );
       `
   )
@@ -1053,9 +1027,11 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
               AND oi.uom = i.uom
               AND oi.domain_id = $1
               AND oi.bizplace_id = $2
-            ), 0) as "remain_uom_value"
+            ), 0) as "remain_uom_value",
+          p.is_inventory_decimal
         FROM inventories i
-        LEFT JOIN locations l ON i.location_id = l.id
+        INNER JOIN locations l ON i.location_id = l.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 
           FROM raw_release_goods rrg
@@ -1071,7 +1047,7 @@ 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
+        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
         ${useDetailedQuery ? ', i.batch_id, i.carton_id, i.expiration_date' : ''}
         ORDER BY foo.sku, remain_qty DESC
       ) SELECT * FROM inv WHERE remain_qty > 0
@@ -1082,7 +1058,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
   await tx.query(`DROP TABLE raw_release_goods`)
 
   availableItems = availableItems.map(item => {
-    return {
+    const mappedItem = {
       productId: item.product_id,
       productDetailId: item.product_detail_id,
       productInfo: item.product_info,
@@ -1094,8 +1070,10 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       remainUomValue: item.remain_uom_value,
       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
+      expirationDate: item.expiration_date ? _getStdDateStr(new Date(item.expiration_date)) : null,
+      isInventoryDecimal: item.is_inventory_decimal === true
     }
+    return mappedItem
   })
 
   return _extractData(rawReleaseGoods, availableItems)
@@ -1146,22 +1124,25 @@ function _extractData(rawData, validatedData) {
     // if sku is matched, assign qty and product id
     if (idx >= 0) {
       // assign qty to rawData as much as possible
-      releaseUomValue =
-        (Math.round((data[idx]?.remainUomValue / data[idx]?.remainQty) * 100) / 100) * raw.releaseQty
+      releaseUomValue = (Math.round((data[idx]?.remainUomValue / data[idx]?.remainQty) * 1000) / 1000) * raw.releaseQty
 
       raw.assignedQty =
-        data[idx].remainQty >= raw.releaseQty
-          ? raw.releaseQty > 0
-            ? raw.releaseQty
-            : 0
-          : data[idx].remainQty
+        Math.round(
+          (data[idx].remainQty >= raw.releaseQty
+        ? raw.releaseQty > 0
+          ? raw.releaseQty
+          : 0
+        : data[idx].remainQty) * 1000
+        ) / 1000
 
       raw.assignedUomValue =
-        data[idx].remainUomValue >= releaseUomValue
-          ? releaseUomValue > 0
-            ? releaseUomValue
-            : 0
-          : data[idx].remainUomValue
+        Math.round(
+          (data[idx].remainUomValue >= releaseUomValue
+        ? releaseUomValue > 0
+          ? releaseUomValue
+          : 0
+        : data[idx].remainUomValue) * 1000
+        ) / 1000
 
       // deduct qty & uomValue from validateData
       data[idx].remainQty -= raw.assignedQty
@@ -1173,67 +1154,69 @@ function _extractData(rawData, validatedData) {
       raw.packingType = data[idx].packingType
       raw.packingSize = data[idx].packingSize
       raw.uom = data[idx].uom
+      raw.isInventoryDecimal = data[idx].isInventoryDecimal === true
     } else {
       raw.assignedQty = 0
       raw.assignedUomValue = 0
       raw.productId = null
     }
 
-    
     const dateRegex = /^\d{4}-\d{2}-\d{2}$/
 
     return {
       ...raw,
       releaseUomValue,
       errorMsg: (() => {
-        const errors = [];
+        const errors = []
 
-        if (errMsg){
+        if (errMsg) {
           errors.push(errMsg)
         }
         if (!raw.productId || !raw.productDetailId) {
-          errors.push('inventory or product not found');
+          errors.push('inventory or product not found')
         }
-        if (raw.releaseQty <= 0 || raw.releaseQty % 1 !== 0) {
-          errors.push('invalid release qty');
+        if (raw.releaseQty <= 0) {
+          errors.push('invalid release qty')
+        }
+        if (raw.releaseQty % 1 !== 0 && raw.isInventoryDecimal !== true) {
+          errors.push('decimal quantities are not allowed for this product')
         }
         if (raw.assignedQty < raw.releaseQty) {
-          errors.push('insufficient stock');
+          errors.push('insufficient stock')
         }
-        if(!dateRegex.test(raw.releaseDate)){
+        if (!dateRegex.test(raw.releaseDate)) {
           errors.push('invalid release date format. please use dd/mm/yyyy')
         }
         if (raw.releaseDate === '') {
-          errors.push('release date is empty');
+          errors.push('release date is empty')
         }
         if (raw.releaseDate < _getStdDateStr(new Date())) {
-          errors.push('backdate is not allowed');
+          errors.push('backdate is not allowed')
         }
         if (!raw.refNo || raw.refNo === '') {
-          errors.push('ref no is empty');
+          errors.push('ref no is empty')
         }
-          if (raw?.type === 'b2c') {
-          if (!raw.attentionTo) errors.push('attention to is empty');
-          if (!raw.postalCode) errors.push('postal code is empty');
-          if (!raw.country) errors.push('country is empty');
-          if (!raw.deliveryAddress1) errors.push('delivery address 1 is empty');
-          if (!raw.city) errors.push('city is empty');
-          if (!raw.phone1) errors.push('contact is empty');
-          if (!raw.state) errors.push('state is empty');
+        if (raw?.type === 'b2c') {
+          if (!raw.attentionTo) errors.push('attention to is empty')
+          if (!raw.postalCode) errors.push('postal code is empty')
+          if (!raw.country) errors.push('country is empty')
+          if (!raw.deliveryAddress1) errors.push('delivery address 1 is empty')
+          if (!raw.city) errors.push('city is empty')
+          if (!raw.phone1) errors.push('contact is empty')
+          if (!raw.state) errors.push('state is empty')
           if ((raw.codOption && !raw.paidAmount) || raw.paidAmount < 0 || raw.paidAmount == null) {
-            errors.push('invalid paid amount');
+            errors.push('invalid paid amount')
           }
-          if(raw?.expirationDate != null && !dateRegex.test(raw?.expirationDate)){
+          if (raw?.expirationDate != null && !dateRegex.test(raw?.expirationDate)) {
             errors.push('invalid expiration date format. please use dd/mm/yyyy')
           }
           if (raw.airwayBill && raw.lmdOption === true) {
-            errors.push('kindly remove AWB as LMD is marked as true');
+            errors.push('kindly remove AWB as LMD is marked as true')
           }
         }
-        return errors.length > 0 ? errors.join(', ') : ''// Combine all errors into a single string
-      })(),
-    };
-    
+        return errors.length > 0 ? errors.join(', ') : '' // Combine all errors into a single string
+      })()
+    }
   })
 }
 

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

@@ -99,7 +99,7 @@ export class InventoryInfos {
   @Field(type => Float, { nullable: true })
   packingSize?: number
 
-  @Field(type => Int, { nullable: false })
+  @Field(type => Float, { nullable: false })
   qty?: number
 
   @Field(type => Float, { nullable: true })

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

@@ -368,6 +368,18 @@ export class ReleaseGood {
   @Field({ nullable: true })
   trackingNo: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  taskId: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  vehicleNo: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  driverName: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   airwayBill: string

package/server/utils/inventory-util.ts

@@ -1,29 +1,10 @@
-import {
-  EntityManager,
-  Equal,
-  getRepository,
-  In,
-  Not,
-  Raw,
-  Repository,
-  SelectQueryBuilder
-} from 'typeorm'
+import { EntityManager, Equal, getRepository, In, Not, Raw, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import {
-  Product,
-  ProductBundle,
-  ProductDetail
-} from '@things-factory/product-base'
-import {
-  PartnerSetting,
-  Setting
-} from '@things-factory/setting-base'
-import {
-  Domain,
-  ListParam
-} from '@things-factory/shell'
+import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import { Domain, ListParam } from '@things-factory/shell'
 import {
   generateInventoryHistory,
   Inventory,
@@ -303,6 +284,7 @@ export const InventoryUtil = {
                   COALESCE(p.sku, '') AS "productSKU",
                   COALESCE(p.brand, '') AS "productBrand",
                   p.id AS "productId",
+                  p.is_inventory_decimal AS "isInventoryDecimal",
                   i.product_detail_id AS "productDetailId",
                   SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)) - SUM(COALESCE(pds.unassigned_qty, 0)) AS "remainQty",
                   SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)) AS "remainUomValue",
@@ -330,8 +312,9 @@ export const InventoryUtil = {
               AND i.transfer_uom_value <= 0
               AND i.lock_inventory is not true
               AND CASE WHEN i.expiration_date IS NOT NULL AND p.min_outbound_shelf_life IS NOT NULL THEN CURRENT_DATE < i.expiration_date - p.min_outbound_shelf_life ELSE true END
-               ${cycleCountFilter ? 
-                  `AND i.id NOT IN (
+               ${
+                 cycleCountFilter
+                   ? `AND i.id NOT IN (
                     SELECT DISTINCT(ici.inventory_id) FROM worksheets w
                     INNER JOIN worksheet_details wd ON wd.worksheet_id = w.id
                     INNER JOIN inventory_check_items ici ON wd.target_inventory_check_item_id = ici.id
@@ -339,8 +322,9 @@ export const InventoryUtil = {
                     AND w.status != 'DONE'
                     AND w.bizplace_id IN (${bizplaceIds})
                     AND w.domain_id = '${domain.id}'
-                    )` : 
-                  `AND true`}
+                    )`
+                   : `AND true`
+               }
               ${productWhereClause}
               GROUP BY
                   i.product_detail_id,
@@ -361,6 +345,7 @@ export const InventoryUtil = {
                   pb.sku AS "productSKU",
                   'brand' AS "productBrand",
                   id AS "productId",
+                  false AS "isInventoryDecimal",
                   pbs.product_detail_id AS "productDetailId",
                   MIN(FLOOR(pbs."availableQty")) AS "remainQty", 
                   MIN(FLOOR(pbs."availableUomValue")) AS "remainUomValue", 
@@ -430,7 +415,7 @@ export const InventoryUtil = {
           } OFFSET $1 LIMIT $2`,
           [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
         )
-      } 
+      }
 
       await trxMgr.query(`drop table temp_inventory_product_group`)
 
@@ -440,7 +425,12 @@ export const InventoryUtil = {
     }
   },
 
-  async bizplaceInventoryProductGroupImport(bizplaces: Bizplace[], params: ListParam, context: any, trxMgr: EntityManager) {
+  async bizplaceInventoryProductGroupImport(
+    bizplaces: Bizplace[],
+    params: ListParam,
+    context: any,
+    trxMgr: EntityManager
+  ) {
     try {
       let filters = params.filters
       const { domain }: { domain: Domain } = context.state
@@ -463,12 +453,13 @@ export const InventoryUtil = {
                   COALESCE(p.sku, '') AS "productSKU",
                   COALESCE(p.brand, '') AS "productBrand",
                   p.id AS "productId",
+                  p.is_inventory_decimal AS "isInventoryDecimal",
                   i.product_detail_id AS "productDetailId",
                   p.picking_strategy AS "pickingStrategy",
                   i.created_at AS "createdAt", 
                   i.expiration_date AS "expirationDate", 
                   i.manufacture_date AS "manufactureDate", 
-                  l2.name AS "locationName",  
+                  l2.name AS "name",  
                   l2.zone AS "zone", 
                   l2.row AS "row", 
                   l2.column AS "column", 
@@ -526,12 +517,13 @@ export const InventoryUtil = {
                   pb.sku AS "productSKU",
                   'brand' AS "productBrand",
                   id AS "productId",
+                  false AS "isInventoryDecimal",
                   pbs.product_detail_id AS "productDetailId",
                   NULL AS "pickingStrategy",
                   NULL AS "createdAt",
                   NULL AS "expirationDate", 
                   NULL AS "manufactureDate",
-                  NULL AS "locationName",
+                  NULL AS "name",
                   NULL AS "zone",
                   NULL AS "row",
                   NULL AS "column",
@@ -570,36 +562,37 @@ export const InventoryUtil = {
       })
 
       const getLocationSortingClause = (inventoryAssignmentSetting: any) => {
-      let locationSortingRules: Array<{ name: string; desc: boolean }> = []
+        let locationSortingRules: Array<{ name: string; desc: boolean }> = []
 
-      if (inventoryAssignmentSetting) {
-        try {
-          let locationSetting = JSON.parse(inventoryAssignmentSetting.value)
-          for (const key in locationSetting) {
-            locationSortingRules.push({ name: key, desc: locationSetting[key] !== 'ASC' }) 
+        if (inventoryAssignmentSetting) {
+          try {
+            let locationSetting = JSON.parse(inventoryAssignmentSetting.value)
+            for (const key in locationSetting) {
+              locationSortingRules.push({ name: key, desc: locationSetting[key] !== 'ASC' })
+            }
+          } catch (error) {
+            console.error('Invalid JSON in inventoryAssignmentSetting:', error)
           }
-        } catch (error) {
-          console.error("Invalid JSON in inventoryAssignmentSetting:", error)
         }
-      }
 
-      if (locationSortingRules.length) {
-        return locationSortingRules
-          .map(rule => `
+        if (locationSortingRules.length) {
+          return locationSortingRules
+            .map(
+              rule => `
             CASE
               WHEN "pickingStrategy" = 'LOCATION' THEN "${rule.name}"
             END ${rule.desc ? 'DESC' : 'ASC'}
-          `)
-          .join(',\n')
-      }
-
-      return `
-        CASE
-          WHEN "pickingStrategy" = 'LOCATION' THEN "locationName"
-        END ASC
-      `
-    }
+          `
+            )
+            .join(',\n')
+        }
 
+        return `
+          CASE
+            WHEN "pickingStrategy" = 'LOCATION' THEN "name"
+          END ASC
+        `
+      }
 
       await trxMgr.query(queryStrings, [domain.id])
 
@@ -608,7 +601,6 @@ export const InventoryUtil = {
       let items: any[] = []
 
       if (!params?.pagination) {
-
         const orderByClause = `
               ORDER BY
           ${getLocationSortingClause(inventoryAssignmentSetting)},
@@ -629,9 +621,7 @@ export const InventoryUtil = {
               ELSE NULL
           END ASC
           `
-        items = await trxMgr.query(
-          `select * from temp_inventory_product_group  ${orderByClause}`
-        )
+        items = await trxMgr.query(`select * from temp_inventory_product_group  ${orderByClause}`)
       }
 
       await trxMgr.query(`drop table temp_inventory_product_group`)
@@ -807,7 +797,7 @@ export const InventoryUtil = {
     )
 
     resultQb.forEach(itm => {
-      if (itm.releaseQty > itm.availableQty) {
+      if (parseFloat(itm.releaseQty) > parseFloat(itm.availableQty)) {
         throw new ValidationError({
           ...ValidationError.ERROR_CODES.RELEASE_QTY_OVER_LIMIT,
           detail: { data: JSON.stringify(resultQb) }
@@ -1336,7 +1326,7 @@ export function _composeTargetInventories(
     let orderInventory: OrderInventory = new OrderInventory()
 
     if (inventory.remainQty > leftReleaseQty) {
-      const uomValuePerQty: number = Math.round((inventory.remainUomValue / inventory.remainQty) * 100) / 100
+      const uomValuePerQty: number = Math.round((inventory.remainUomValue / inventory.remainQty) * 1000) / 1000
 
       compReleaseQty += leftReleaseQty
       compReleaseUomValue += leftReleaseUomValue
@@ -1344,7 +1334,7 @@ export function _composeTargetInventories(
       orderInventory = {
         ...orderInventory,
         releaseQty: leftReleaseQty,
-        releaseUomValue: Math.round(leftReleaseQty * uomValuePerQty * 100) / 100
+        releaseUomValue: Math.round(leftReleaseQty * uomValuePerQty * 1000) / 1000
       }
     } else {
       compReleaseQty += inventory.remainQty