@things-factory/warehouse-base 4.3.24 → 4.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "4.3.24",
+  "version": "4.3.25",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,10 +26,10 @@
   "dependencies": {
     "@things-factory/biz-base": "^4.3.24",
     "@things-factory/id-rule-base": "^4.3.24",
-    "@things-factory/integration-sellercraft": "^4.3.24",
-    "@things-factory/marketplace-base": "^4.3.24",
+    "@things-factory/integration-sellercraft": "^4.3.25",
+    "@things-factory/marketplace-base": "^4.3.25",
     "@things-factory/product-base": "^4.3.24",
     "@things-factory/setting-base": "^4.3.24"
   },
-  "gitHead": "43ba20d3476c8604e94f6a6b0bd7e84b6ec1bfd8"
+  "gitHead": "bdcecd8454d7a76df3c5676a39440d57bc21d5cb"
 }

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

@@ -9,7 +9,6 @@ import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@thi
 
 import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants'
 import { InventoryChange } from '../inventory-change/inventory-change'
-import { InventoryItem } from '../inventory-item/inventory-item'
 import { Inventory } from './inventory'
 import { InventoryBundleGroupDetail, InventoryList } from './inventory-types'
 
@@ -155,8 +154,8 @@ export class InventoryQuery {
           item.product['productDetails'] = productDetails
           return {
             ...item,
-            remainQty: item.qty - item.lockedQty ? item.lockedQty : 0,
-            remainUomValue: item.uomValue - item.lockedUomValue ? item.lockedUomValue : 0,
+            remainQty: item.qty - (item.lockedQty ? item.lockedQty : 0),
+            remainUomValue: item.uomValue - (item.lockedUomValue ? item.lockedUomValue : 0),
             serialNumbers: inventoryItems[0]?.serialNumbers
           }
         })

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

@@ -1166,7 +1166,7 @@ export class InventoryHistoryQuery {
                inner join bizplaces bz on bz.id = rih.bizplace_id
                inner join locations loc on loc.id = rih.location_id
                inner join warehouses wh on wh.id = loc.warehouse_id
-               inner join order_inventories oi on oi.inventory_id = rih.inventory_id
+               left  join order_inventories oi on oi.inventory_id = rih.inventory_id
                group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
                rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
                having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then  rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)
@@ -1199,7 +1199,7 @@ export class InventoryHistoryQuery {
           inner join bizplaces bz on bz.id = rih.bizplace_id
           inner join locations loc on loc.id = rih.location_id
           inner join warehouses wh on wh.id = loc.warehouse_id
-          inner join order_inventories oi on oi.inventory_id = rih.inventory_id
+          left join order_inventories oi on oi.inventory_id = rih.inventory_id
           group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
           rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
           having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then  rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)

package/server/utils/inventory-util.ts

@@ -349,7 +349,7 @@ export async function getProductBundleInventory(
           from json_populate_recordset(NULL::order_products,'${orderProductsJson}') src 
           inner join product_details pd ON src.product_id = pd.product_id and src.packing_type = pd.packing_type and src.packing_size = pd.packing_size and src.uom = pd.uom
           inner join product_bundle_settings pbs on pbs.product_detail_id = pd.id
-          inner join product_bundles pb on pb.id = pbs.product_bundle_id
+          inner join product_bundles pb on pb.id = pbs.product_bundle_id and pb.status = 'ACTIVATED'
           where pb.domain_id = $1
           group by pb.id, pb.sku, pb.name
         ) pb