@things-factory/warehouse-base 4.3.256 → 4.3.261

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "4.3.256",
+  "version": "4.3.261",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -31,5 +31,5 @@
     "@things-factory/product-base": "^4.3.253",
     "@things-factory/setting-base": "^4.3.253"
   },
-  "gitHead": "c1b9ba08f80595ac4bf77dedd5bac12720c4c581"
+  "gitHead": "c085fa97b4a7a9abd06aab1820d4e7dbc4ed83ad"
 }

package/server/controllers/ecommerce/powrup-controller.ts

@@ -5,6 +5,7 @@ import { Powrup, PowrupAPI, Platform } from '@things-factory/integration-powrup'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants'
 import { Inventory } from '../../service/inventory/inventory'
+import { ProductDetailStock } from '../../service/product-detail-stock/product-detail-stock'
 import { Domain, User } from '@things-factory/shell'
 
 export class PowrupController {
@@ -71,12 +72,16 @@ export class PowrupController {
             }
           })
 
+          const productDetailStock: ProductDetailStock = await trxMgr
+            .getRepository(ProductDetailStock)
+            .findOne({ productDetail })
+
           const powrupInvs: any[] = [
             {
               refCode: productDetail.refCode,
               stock: {
                 quantityTotal: inventoryTotalQty || 0,
-                quantityReserved: inventoryTotalLockedQty || 0,
+                quantityReserved: inventoryTotalLockedQty + (productDetailStock.unassignedQty || 0) || 0,
                 quantityBuffer: inventoryBufferQty || 0
               }
             }

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

@@ -236,13 +236,12 @@ export class InventoryQuery {
 
       let bizplaceQuery = ''
       if (permittedBizplaceIds.length > 0) {
-        bizplaceQuery = `AND EXISTS (
-          SELECT * FROM (VALUES ${permittedBizplaceIds.map(id => `('${id}')`).join(',')})
-          AS bizFilter(bizplace_id)
-          WHERE bizFilter.bizplace_id::uuid = "Inventory"."bizplace_id"
-        )`
+        bizplaceQuery = `
+          select bizplace_id::uuid from (VALUES ${permittedBizplaceIds.map(id => `('${id}')`).join(',')})
+          as bizFilter(bizplace_id)
+        `
       } else {
-        bizplaceQuery = `1 = 0`
+        bizplaceQuery = `select null as bizplace_id`
       }
 
       let productQuery = ''
@@ -255,13 +254,10 @@ export class InventoryQuery {
           })
           .join(',')
         productQuery = `AND (
-          Lower("Product"."name") LIKE ANY(ARRAY[${productValue}])
-          OR Lower("Product"."sku") LIKE ANY(ARRAY[${productValue}])
-          OR Lower("Product"."brand") LIKE ANY(ARRAY[${productValue}])
-          OR Lower("Product"."description") LIKE ANY(ARRAY[${productValue}])
-          OR Lower("ProductRef"."name") LIKE ANY(ARRAY[${productValue}])
-          OR Lower("ProductRef"."sku") LIKE ANY(ARRAY[${productValue}])
-          OR Lower("ProductRef"."description") LIKE ANY(ARRAY[${productValue}])
+          Lower("p"."name") LIKE ANY(ARRAY[${productValue}])
+          OR Lower("p"."sku") LIKE ANY(ARRAY[${productValue}])
+          OR Lower("p"."brand") LIKE ANY(ARRAY[${productValue}])
+          OR Lower("p"."description") LIKE ANY(ARRAY[${productValue}])
         )`
       }
 
@@ -276,7 +272,7 @@ export class InventoryQuery {
         productQuery =
           productQuery +
           ` AND (
-          Lower("Product"."type") LIKE ANY(ARRAY[${productTypeValue}])
+          Lower("p"."type") LIKE ANY(ARRAY[${productTypeValue}])
         )`
       }
 
@@ -297,7 +293,8 @@ export class InventoryQuery {
       }
 
       if (availableStockFilter?.value) {
-        availableStockQuery = ` AND SUM("Inventory"."qty") > 0`
+        //availableStockQuery = ` AND SUM(coalesce(i."qty",0)) >= 0`
+        availableStockQuery = ` AND "availableQty" > 0`
       }
 
       if (availableStockFilter?.value && quarantineStockFilter?.value) {
@@ -364,91 +361,102 @@ export class InventoryQuery {
         `
         create temp table temp_inv_history AS 
         (
-          SELECT "Product"."id" AS "id","ProductDetails"."id" AS "productDetailId", "Product"."sku" AS "sku", "Product"."brand" AS "brand", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description", 
-          "Inventory"."packing_type" AS "packingType", "ProductDetails"."aux_unit_1" AS "auxUnit1", "ProductDetails"."aux_value_1" AS "auxValue1",
-          "ProductDetails"."aux_unit_2" AS "auxUnit2", "ProductDetails"."aux_value_2" AS "auxValue2",
-          "ProductDetails"."aux_unit_3" AS "auxUnit3", "ProductDetails"."aux_value_3" AS "auxValue3",
-          "ProductDetails"."aux_unit_4" AS "auxUnit4", "ProductDetails"."aux_value_4" AS "auxValue4",
-          "ProductDetails"."aux_unit_5" AS "auxUnit5", "ProductDetails"."aux_value_5" AS "auxValue5",
-          "Product"."weight" AS "weight", "ProductRef"."id" AS "productRefId", 
-          "ProductRef"."description" AS "productRefDesciption", "Bizplace"."id" AS "bizplaceId", "Bizplace"."name" AS "bizplaceName",
-          CASE WHEN SUM("Inventory"."qty") > 0 THEN SUM(COALESCE("Inventory"."unit_cost", 0) * "Inventory"."qty")/ SUM("Inventory"."qty") ELSE 0 END AS "averageUnitCost",
-          COALESCE("ProductDetailBizplaceSetting"."min_qty", "Product"."min_qty",0) AS "minQty", 
-          COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0) AS "maxQty",
-          (CASE WHEN "Location"."type" NOT IN ('${LOCATION_TYPE.QUARANTINE}','${LOCATION_TYPE.RESERVE}')
-          AND CASE WHEN "Inventory"."expiration_date" is not null and "Product"."shelf_life" is not null then CURRENT_DATE < "Inventory"."expiration_date" - "Product"."shelf_life" else true end
-          AND "Inventory"."obsolete" is false
-                  THEN 
-              CASE WHEN SUM("Inventory"."qty") > 0 
-              THEN SUM("Inventory"."qty")
-            ELSE 0 END
-          ELSE 0 END) AS "qty",
-          (CASE WHEN "Location"."type" NOT IN ('${LOCATION_TYPE.QUARANTINE}','${LOCATION_TYPE.RESERVE}') 
-          AND CASE WHEN "Inventory"."expiration_date" is not null and "Product"."shelf_life" is not null then CURRENT_DATE < "Inventory"."expiration_date" - "Product"."shelf_life" else true end
-          AND "Inventory"."obsolete" is false
-          THEN 
-          CASE WHEN SUM("Inventory"."qty") > 0 THEN SUM("Inventory"."qty") ELSE 0 END - SUM(COALESCE("Inventory"."locked_qty", 0))
-        ELSE 0 END) AS "availableQty",
-          CASE WHEN "Location"."type" = '${LOCATION_TYPE.QUARANTINE}' 
-          THEN 
-            CASE WHEN SUM("Inventory"."qty") > 0 
-            THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0))
-            ELSE 0 END
-          ELSE 0 END AS "quarantineQty",
-          CASE WHEN "Location"."type" = '${LOCATION_TYPE.RESERVE}' 
-          THEN 
-            CASE WHEN SUM("Inventory"."qty") > 0 
-            THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0))
-            ELSE 0 END
-          ELSE 0 END AS "reserveQty",
-          CASE WHEN "Location"."type" = '${LOCATION_TYPE.BIN}' 
-            THEN SUM("Inventory"."qty") 
-            ELSE 0 
-          END AS "binQty",
-          CASE WHEN "Inventory"."obsolete" is true or
-          CASE WHEN "Inventory"."expiration_date" is not null and "Product"."shelf_life" is not null then CURRENT_DATE > "Inventory"."expiration_date" - "Product"."shelf_life" else false end        
-              THEN 
-              CASE WHEN SUM("Inventory"."qty") > 0 
-              THEN SUM("Inventory"."qty")
-            ELSE 0 END
-          ELSE 0 END AS "obsoleteQty",
-          CASE WHEN "Location"."type" = '${LOCATION_TYPE.DAMAGE}'
-          THEN
-            CASE WHEN SUM("Inventory"."qty") > 0
-            THEN SUM("Inventory"."qty")
-            ELSE 0 END
-          ELSE 0 END AS "damageQty",
-          CASE WHEN "Location"."type" = '${LOCATION_TYPE.STORAGE}' 
-          THEN 
-            CASE WHEN SUM("Inventory"."qty") > 0 
-            THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0))
-            ELSE 0 END
-          ELSE 0 END AS "storageQty",
-          CASE WHEN "Inventory"."transfer_qty" > 0
-          THEN 
-            SUM("Inventory"."transfer_qty")
-          ELSE 0 END AS "transferQty",
-          SUM(COALESCE("Inventory"."locked_qty", 0)) AS "locked_qty"
-          FROM "inventories" "Inventory" 
-          LEFT JOIN "products" "Product" ON "Product"."id"="Inventory"."product_id" 
-          LEFT JOIN "product_details" "ProductDetails" ON "ProductDetails"."product_id" = "Product"."id" AND "ProductDetails"."is_default"
-          LEFT JOIN "product_detail_bizplace_settings" "ProductDetailBizplaceSetting" ON "ProductDetailBizplaceSetting"."product_detail_id" = "ProductDetails"."id"
-          LEFT JOIN "product_detail_stocks" "ProductDetailStock" ON "ProductDetailStock"."product_detail_id" = "ProductDetails"."id"
-          AND "ProductDetailBizplaceSetting"."domain_id" = "Inventory"."domain_id"
-          LEFT JOIN "products" "ProductRef" ON "ProductRef"."id"="Product"."product_ref_id"
-            INNER JOIN "bizplaces" "Bizplace" ON "Bizplace"."id"="Inventory"."bizplace_id"
-            INNER JOIN "locations" "Location" ON "Location"."id" = "Inventory"."location_id"
-            WHERE "Inventory"."qty" >= 0
-            AND "Inventory"."status" <> 'MISSING' AND "Inventory"."status" <> 'PUTTING_AWAY'
-          AND "Inventory"."domain_id" = $1
-          ${bizplaceQuery}
-          ${productQuery}
-          GROUP BY "Product"."id","Bizplace"."id","Bizplace"."name" ,"ProductDetailBizplaceSetting"."id", "ProductDetails"."id",
-          "Inventory"."packing_type", "Inventory"."packing_size", "Inventory"."uom", 
-          "Location"."type", "ProductRef"."id","Inventory"."transfer_qty",
-          "Inventory"."expiration_date", "Inventory"."obsolete"
-          HAVING 1 = 1
-          ${availableStockQuery}
+          select p."id" as "id", pd."id" as "productDetailId", p."sku" as "sku", p."brand" as "brand", p."name" as "name", p."type" as "type", p."description" as "description", 
+          coalesce(i."packing_type", pd."packing_type") as "packingType", p."weight" as "weight", 
+          pd."aux_unit_1" as "auxUnit1", pd."aux_value_1" as "auxValue1", pd."aux_unit_2" as "auxUnit2", pd."aux_value_2" as "auxValue2",
+          pd."aux_unit_3" as "auxUnit3", pd."aux_value_3" as "auxValue3", pd."aux_unit_4" as "auxUnit4", pd."aux_value_4" as "auxValue4",
+          pd."aux_unit_5" as "auxUnit5", pd."aux_value_5" as "auxValue5", coalesce(inv_bz."id", bz2."id") as "bizplaceId", coalesce(inv_bz."name", bz2."name") as "bizplaceName",
+          COALESCE(pdbs."min_qty", p."min_qty",0) as "minQty", COALESCE(pdbs."max_qty", p."max_qty",0) as "maxQty",
+					(
+						case when sum(coalesce(i."qty",0)) > 0 then sum(coalesce(i."unit_cost", 0) * coalesce(i."qty",0))/ sum(coalesce(i."qty",0)) 
+						else 0 end 
+					) as "averageUnitCost",
+          (
+            case when inv_loc."type" NOT IN ('QUARANTINE','RESERVE') and 
+            case when i."expiration_date" is not null and p."shelf_life" is not null then CURRENT_DATE < i."expiration_date" - p."shelf_life" else true end
+            and i."obsolete" is false
+              then 
+                case when sum(coalesce(i."qty",0)) > 0 then sum(coalesce(i."qty",0)) else 0 end
+            else 0 end
+          ) as "qty",
+          (
+            case when inv_loc."type" NOT IN ('QUARANTINE','RESERVE') 
+            and case when i."expiration_date" is not null and p."shelf_life" is not null then CURRENT_DATE < i."expiration_date" - p."shelf_life" else true end
+            and i."obsolete" is false
+            then 
+            case when sum(coalesce(i."qty",0)) > 0 then sum(coalesce(i."qty",0)) else 0 end - sum(COALESCE(i."locked_qty", 0))
+            else 0 end
+          ) as "availableQty",
+          (
+            case when inv_loc."type" = 'QUARANTINE' 
+              then case when sum(coalesce(i."qty",0)) > 0 
+                  then sum(coalesce(i."qty",0))-sum(COALESCE(i."locked_qty", 0))
+                else 0 end
+            else 0 end 
+          ) as "quarantineQty",
+          (
+            case when inv_loc."type" = 'RESERVE' 
+            then 
+              case when sum(coalesce(i."qty",0)) > 0 
+              then sum(coalesce(i."qty",0))-sum(COALESCE(i."locked_qty", 0))
+              else 0 end
+            else 0 end
+          ) as "reserveQty",
+          (
+            case when inv_loc."type" = 'BIN' 
+            then sum(coalesce(i."qty",0)) 
+              else 0 
+            end 
+          )as "binQty",
+          (
+            case when i."obsolete" is true or 
+            case when i."expiration_date" is not null and p."shelf_life" is not null then CURRENT_DATE > i."expiration_date" - p."shelf_life" else false end        
+              then 
+                case when sum(coalesce(i."qty",0)) > 0 then sum(coalesce(i."qty",0)) else 0 end
+            else 0 end
+          ) as "obsoleteQty",
+          (
+            case when inv_loc."type" = 'DAMAGE'
+              then
+                case when sum(coalesce(i."qty",0)) > 0
+                  then sum(coalesce(i."qty",0))
+                else 0 end
+            else 0 end
+          ) as "damageQty",
+          (
+            case when inv_loc."type" = 'STORAGE'
+            then 
+              case when sum(coalesce(i."qty",0)) > 0 
+              then sum(coalesce(i."qty",0))-sum(COALESCE(i."locked_qty", 0))
+              else 0 end
+            else 0 end
+          ) as "storageQty",
+          (
+            case when i."transfer_qty" > 0
+            then 
+              sum(i."transfer_qty")
+            else 0 end 
+          ) as "transferQty",
+          sum(coalesce(i."locked_qty", 0)) as "locked_qty"
+          from (
+            ${bizplaceQuery}
+          ) b 
+          inner join bizplaces bz on bz.id = b.bizplace_id
+          inner join companies c on c.id = bz.company_id 
+          inner join bizplaces bz2 on bz2.domain_id = c.domain_id
+          inner join products p on (p.bizplace_id = b.bizplace_id::uuid or p.bizplace_id = bz2.id)
+          inner join product_details pd on pd.product_id = p.id and pd.is_default
+          left join product_detail_bizplace_settings pdbs on pdbs.product_detail_id = pd.id
+          left join inventories i on i.bizplace_id =b.bizplace_id	and i.product_id = p.id and i.qty >= 0 and i.status <> 'MISSING' and i.status <> 'PUTTING_AWAY' and 
+            i.domain_id = $1
+          left join product_detail_stocks pds on pds.product_detail_id = pd.id and pds.domain_id = i.domain_id
+          left join bizplaces inv_bz on inv_bz.id = i.bizplace_id
+          left join locations inv_loc on inv_loc.id = i.location_id
+          where 1=1
+          ${productQuery}  
+          group by p."id", coalesce(inv_bz."id", bz2."id"), coalesce(inv_bz."name", bz2."name"), pdbs."id", pd."id",
+          i."packing_type", i."packing_size", i."uom", i."transfer_qty", i."expiration_date", i."obsolete",
+          inv_loc."type"     
         )`,
         [domain.id]
       )
@@ -464,7 +472,7 @@ export class InventoryQuery {
                 SUM("quarantineQty") AS "quarantineQty",
                 SUM("reserveQty") AS "reserveQty", 
                 COALESCE("opd"."total_release_qty", 0) as "draftQty",
-                SUM("tih"."locked_qty") + "pds"."unassigned_qty" as "releaseQty",
+                SUM(COALESCE("tih"."locked_qty",0)) + COALESCE("pds"."unassigned_qty",0) as "releaseQty",
                 COALESCE("opd"."total_release_qty", 0) - SUM("availableQty") - COALESCE("putawayinv"."putaway_qty", 0) AS "insufficientQty", 
                 SUM("availableQty") + COALESCE("putawayinv"."putaway_qty", 0) - COALESCE("pds"."unassigned_qty",0) AS "availableQty", 
                 SUM("quarantineQty" + "reserveQty" + "availableQty") + COALESCE("putawayinv"."putaway_qty", 0) - COALESCE("opd"."total_release_qty", 0) AS "warehouseQty",
@@ -486,7 +494,7 @@ export class InventoryQuery {
             GROUP BY "op"."product_id","op"."packing_type" ,"op"."packing_size", "op"."uom"
           ) AS "opd"
           ON "tih"."id" = "opd"."product_id" 
-          AND "tih"."packingType" = "opd"."packing_type"
+            AND "tih"."packingType" = "opd"."packing_type"
           LEFT JOIN 
           ( 
             SELECT SUM(i.qty) as "putaway_qty", i.product_id, i.packing_type, i.packing_size, i.uom FROM "inventories" i 
@@ -505,6 +513,8 @@ export class InventoryQuery {
       const results: any = await tx.query(
         `
           SELECT * FROM grouped_inventories_product
+          WHERE 1 = 1
+          ${availableStockQuery} 
           ORDER BY "bizplaceName", "sku"
           OFFSET $1 LIMIT $2
         `,