@things-factory/warehouse-base 3.7.1 → 3.7.6

package/dist-server/graphql/resolvers/inventory-history/onhand-inventories.js

@@ -1,198 +1,200 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onhandInventoriesResolver = void 0;
+exports.onhandInventories = exports.onhandInventoriesResolver = void 0;
 const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 exports.onhandInventoriesResolver = {
     async onhandInventories(_, { filters, pagination, sortings, locationSortingRules }, context) {
-        const { domain, user, tx } = context.state;
-        // define all inputs
-        let userFilter = filters.find(data => data.name === 'user');
-        let product = filters.find(data => data.name === 'product');
-        let createdAt = filters.find(data => data.name === 'created_at');
-        let location = filters.find(data => data.name === 'location');
-        let batchId = filters.find(data => data.name === 'batchId');
-        let palletId = filters.find(data => data.name === 'palletId');
-        let cartonId = filters.find(data => data.name === 'cartonId');
-        let packingType = filters.find(data => data.name === 'packingType');
-        let timezoneOffset = filters.find(data => data.name === 'timezoneOffset').value + ' minutes';
-        // expiration date filter
-        let expiration = filters.find(data => data.name === 'expiration').value;
-        let expFromDate = filters.find(data => data.name === 'expFromDate');
-        let expToDate = filters.find(data => data.name === 'expToDate');
-        let bizplaceFilter = { name: '', operator: '', value: [] };
-        // prepare query filters
-        if (userFilter) {
-            const user = await tx.getRepository(auth_base_1.User).findOne({
-                where: { id: userFilter.value },
-                relations: ['bizplaces']
-            });
-            const bizplace = user.bizplaces[0];
-            if (!bizplace)
-                throw 'Invalid input';
-            bizplaceFilter = { name: 'bizplace', operator: 'eq', value: [bizplace.id] };
-        }
-        else {
-            bizplaceFilter = !filters.find((filter) => filter.name === 'bizplace')
-                ? {
-                    name: 'bizplace',
-                    operator: 'in',
-                    value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
-                    relation: true
-                }
-                : Object.assign(Object.assign({}, filters.find(data => data.name === 'bizplace')), { value: [filters.find(data => data.name === 'bizplace').value] });
-        }
-        let queryFilter = ``;
-        let bizplaces = bizplaceFilter.value.map(id => `('${id}')`).join(',');
-        if (product) {
-            let products = product.value
-                .toLowerCase()
-                .split(',')
-                .map(prod => {
-                return "'%" + prod.trim().replace(/'/g, "''") + "%'";
-            })
-                .join(',');
-            queryFilter =
-                queryFilter +
-                    ` and exists (
-            select prd.id as product_id from products prd
-            inner join bizplaces b on b.id = prd.bizplace_id 
-            inner join companies c on c.domain_id = b.domain_id 
-            inner join bizplaces b2 on b2.company_id = c.id
-            where exists (
-              SELECT * FROM tmp_bizfilter bizFilter
-              WHERE bizFilter.bizplace_id = "b2"."id"
-            )
-            and (lower(prd.name) like any(array[${products}])
-            or lower(prd.description) like any(array[${products}])
-            or lower(prd.sku) like any(array[${products}]))
-            and prd.id = rih.product_id
-            group by prd.id
-        )`;
-        }
-        if (location) {
-            let locations = location.value
-                .map(loc => {
-                return "'" + loc + "'";
-            })
-                .join(',');
-            queryFilter =
-                queryFilter +
-                    `and exists (
-          select loc.id from locations loc where
-          loc.id = any(array[${locations}]::uuid[])
-          and loc.id = rih.location_id
-        )`;
-        }
-        // default sorting
-        let queryOrder = 'order by created_at desc';
-        if (sortings && sortings.length > 0) {
-            const arrObjectMap = [
-                { name: 'palletId', value: 'rih.pallet_id' },
-                { name: 'cartonId', value: 'rih.carton_id' },
-                { name: 'batchId', value: 'rih.batch_id' },
-                { name: 'initialInboundAt', value: 'rih.initial_inbound_at' },
-                { name: 'bizplace|name', value: 'bz.name' },
-                { name: 'product|name', value: 'prd.sku' },
-                { name: 'remainQty', value: 'rih.qty' },
-                { name: 'location|name', value: 'loc.name' }
-            ];
-            sortings.forEach((sorting, idx) => {
-                let itmIndex = arrObjectMap.findIndex(x => x.name === sorting.name);
-                queryOrder = `${idx === 0 ? 'order by' : queryOrder + ','} ${itmIndex >= 0 ? arrObjectMap[itmIndex].value : sorting.name} ${sorting.desc ? 'DESC' : 'ASC'}`;
-            });
-        }
-        if (batchId)
-            queryFilter = `${queryFilter} and lower(rih.batch_id) like '${batchId.value.toLowerCase()}' `;
-        if (palletId)
-            queryFilter = `${queryFilter} and rih.pallet_id like '${palletId.value}' `;
-        if (cartonId)
-            queryFilter = `${queryFilter} and rih.carton_id like '${cartonId.value}' `;
-        if (packingType)
-            queryFilter = `${queryFilter} and rih.packing_type like '${packingType.value}' `;
-        let expirationQueryFilter = ``;
-        if (expiration)
-            expirationQueryFilter = ` and iv.expiration_date >= '${expFromDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL and 
-      iv.expiration_date <= '${expToDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL + '1 day'::INTERVAL`;
-        // query the results
-        await tx.query(`
-      CREATE TEMP TABLE tmp_bizfilter AS (
-        SELECT bizplace_id::uuid FROM (VALUES ${bizplaces}) AS bizFilter(bizplace_id)
-      );
-    `);
-        await tx.query(`
-      create temp table tmp_src as (
-        select domain_id, pallet_id, carton_id, seq, qty, uom_value, packing_type, batch_id, batch_id_ref, created_at, status,
-        product_id::uuid as product_id, bizplace_id::uuid as bizplace_id, location_id::uuid as location_id 
-        from reduced_inventory_histories rih 
-        where domain_id = $1 and created_at < $2::timestamp + $3::INTERVAL + '1 day'::INTERVAL 
-      );
-    `, [domain.id, createdAt.value, timezoneOffset]);
-        await tx.query(`          
-        create temp table tmp_data as (
-          select dt.*, rih.carton_id, rih.batch_id, rih.batch_id_ref, rih.product_id, rih.packing_type, rih.bizplace_id, rih.location_id, iv.uom, 
-          iv.expiration_date, iv.reusable_pallet_id, iv.remark
-          from
-          (
-            select ih.domain_id, ih.pallet_id, sum(ih.qty) as qty, sum(ih.uom_value) as uom_value, max(ih.seq) as last_seq, max(ih.created_at) as created_at,
-            min(ih.created_at) as initial_inbound_at
-            from tmp_src ih
-            group by ih.domain_id, ih.pallet_id
-          ) dt
-          inner join tmp_src rih on dt.domain_id = rih.domain_id and dt.pallet_id = rih.pallet_id and dt.last_seq = rih.seq and rih.status <> 'TERMINATED'
-          inner join inventories iv on iv.domain_id = dt.domain_id and iv.pallet_id = dt.pallet_id
+        return await onhandInventories(filters, pagination, sortings, locationSortingRules, context);
+    }
+};
+async function onhandInventories(filters, pagination, sortings, locationSortingRules, context, setPagination = true) {
+    const { domain, user, tx } = context.state;
+    // define all inputs
+    let userFilter = filters.find(data => data.name === 'user');
+    let product = filters.find(data => data.name === 'product');
+    let createdAt = filters.find(data => data.name === 'created_at');
+    let location = filters.find(data => data.name === 'location');
+    let batchId = filters.find(data => data.name === 'batchId');
+    let palletId = filters.find(data => data.name === 'palletId');
+    let cartonId = filters.find(data => data.name === 'cartonId');
+    let packingType = filters.find(data => data.name === 'packingType');
+    let timezoneOffset = filters.find(data => data.name === 'timezoneOffset').value + ' minutes';
+    // expiration date filter
+    let expiration = filters.find(data => data.name === 'expiration').value;
+    let expFromDate = filters.find(data => data.name === 'expFromDate');
+    let expToDate = filters.find(data => data.name === 'expToDate');
+    let bizplaceFilter = { name: '', operator: '', value: [] };
+    // prepare query filters
+    if (userFilter) {
+        const user = await tx.getRepository(auth_base_1.User).findOne({
+            where: { id: userFilter.value },
+            relations: ['bizplaces']
+        });
+        const bizplace = user.bizplaces[0];
+        if (!bizplace)
+            throw 'Invalid input';
+        bizplaceFilter = { name: 'bizplace', operator: 'eq', value: [bizplace.id] };
+    }
+    else {
+        bizplaceFilter = !filters.find((filter) => filter.name === 'bizplace')
+            ? {
+                name: 'bizplace',
+                operator: 'in',
+                value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
+                relation: true
+            }
+            : Object.assign(Object.assign({}, filters.find(data => data.name === 'bizplace')), { value: [filters.find(data => data.name === 'bizplace').value] });
+    }
+    let queryFilter = ``;
+    let bizplaces = bizplaceFilter.value.map(id => `('${id}')`).join(',');
+    if (product) {
+        let products = product.value
+            .toLowerCase()
+            .split(',')
+            .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'";
+        })
+            .join(',');
+        queryFilter =
+            queryFilter +
+                ` and exists (
+          select prd.id as product_id from products prd
+          inner join bizplaces b on b.id = prd.bizplace_id 
+          inner join companies c on c.domain_id = b.domain_id 
+          inner join bizplaces b2 on b2.company_id = c.id
           where exists (
             SELECT * FROM tmp_bizfilter bizFilter
-            WHERE bizFilter.bizplace_id = "rih"."bizplace_id"
+            WHERE bizFilter.bizplace_id = "b2"."id"
           )
-          ${queryFilter}
-          ${expirationQueryFilter}
-        );
-      `);
-        const total = await tx.query(`select count(*) from tmp_data`);
-        const result = await tx.query(` 
-          select 
-          rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", rih.uom_value as "uomValue", rih.uom, rih.last_seq, rih.created_at,
-          rih.initial_inbound_at as "initialInboundAt",
-          case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
-          rih.batch_id_ref as "batchIdRef", rih.product_id, rih.packing_type as "packingType", rih.bizplace_id, rih.location_id,
-          prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.description as product_description,
-          bz.id as bizplace_id, bz.name as bizplace_name, 
-          loc.id as location_id, loc.name as location_name, loc."zone" as location_zone, loc."row" as location_row, loc."column" as location_column, loc.shelf as location_shelf,
-          wh.name as warehouse_name, plt.name as reusable_pallet_name,
-          rih.remark,
-          rih.expiration_date as "expirationDate"
-          from tmp_data rih
-          left join pallets plt on plt.id = rih.reusable_pallet_id
-          inner join products prd on prd.id = rih.product_id
-          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
-          WHERE 1 = 1
-          ${queryOrder}
-          OFFSET $1 LIMIT $2;
-      `, [(pagination.page - 1) * pagination.limit, pagination.limit]);
-        tx.query(`
-      drop table tmp_src, tmp_data, tmp_bizfilter
-    `);
-        // map all results
-        let items = result.map(itm => {
-            return Object.assign(Object.assign({}, itm), { bizplace: {
-                    id: itm.bizplace_id,
-                    name: itm.bizplace_name
-                }, location: {
-                    id: itm.location_id,
-                    name: itm.location_name,
-                    type: itm.location_type,
-                    zone: itm.location_zone
-                }, product: {
-                    id: itm.product_id,
-                    name: itm.product_name,
-                    description: itm.product_description,
-                    sku: itm.product_sku
-                } });
+          and (lower(prd.name) like any(array[${products}])
+          or lower(prd.description) like any(array[${products}])
+          or lower(prd.sku) like any(array[${products}]))
+          and prd.id = rih.product_id
+          group by prd.id
+      )`;
+    }
+    if (location) {
+        let locations = location.value
+            .map(loc => {
+            return "'" + loc + "'";
+        })
+            .join(',');
+        queryFilter =
+            queryFilter +
+                `and exists (
+        select loc.id from locations loc where
+        loc.id = any(array[${locations}]::uuid[])
+        and loc.id = rih.location_id
+      )`;
+    }
+    // default sorting
+    let queryOrder = 'order by created_at desc';
+    if (sortings && sortings.length > 0) {
+        const arrObjectMap = [
+            { name: 'palletId', value: 'rih.pallet_id' },
+            { name: 'cartonId', value: 'rih.carton_id' },
+            { name: 'batchId', value: 'rih.batch_id' },
+            { name: 'initialInboundAt', value: 'rih.initial_inbound_at' },
+            { name: 'bizplace|name', value: 'bz.name' },
+            { name: 'product|name', value: 'prd.sku' },
+            { name: 'remainQty', value: 'rih.qty' },
+            { name: 'location|name', value: 'loc.name' }
+        ];
+        sortings.forEach((sorting, idx) => {
+            let itmIndex = arrObjectMap.findIndex(x => x.name === sorting.name);
+            queryOrder = `${idx === 0 ? 'order by' : queryOrder + ','} ${itmIndex >= 0 ? arrObjectMap[itmIndex].value : sorting.name} ${sorting.desc ? 'DESC' : 'ASC'}`;
         });
-        return { items, total: total[0].count };
     }
-};
+    if (batchId)
+        queryFilter = `${queryFilter} and lower(rih.batch_id) like '${batchId.value.toLowerCase()}' `;
+    if (palletId)
+        queryFilter = `${queryFilter} and rih.pallet_id like '${palletId.value}' `;
+    if (cartonId)
+        queryFilter = `${queryFilter} and rih.carton_id like '${cartonId.value}' `;
+    if (packingType)
+        queryFilter = `${queryFilter} and rih.packing_type like '${packingType.value}' `;
+    let expirationQueryFilter = ``;
+    if (expiration)
+        expirationQueryFilter = ` and iv.expiration_date >= '${expFromDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL and 
+    iv.expiration_date <= '${expToDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL + '1 day'::INTERVAL`;
+    // query the results
+    await tx.query(`
+    CREATE TEMP TABLE tmp_bizfilter on commit drop AS (
+      SELECT bizplace_id::uuid FROM (VALUES ${bizplaces}) AS bizFilter(bizplace_id)
+    );
+  `);
+    await tx.query(`
+    create temp table tmp_src on commit drop as (
+      select domain_id, pallet_id, carton_id, seq, qty, uom_value, packing_type, batch_id, batch_id_ref, created_at, status,
+      product_id::uuid as product_id, bizplace_id::uuid as bizplace_id, location_id::uuid as location_id 
+      from reduced_inventory_histories rih 
+      where domain_id = $1 and created_at < $2::timestamp + $3::INTERVAL + '1 day'::INTERVAL 
+    );
+  `, [domain.id, createdAt.value, timezoneOffset]);
+    await tx.query(`          
+      create temp table tmp_data on commit drop as (
+        select dt.*, rih.carton_id, rih.batch_id, rih.batch_id_ref, rih.product_id, rih.packing_type, rih.bizplace_id, rih.location_id, iv.uom, 
+        iv.expiration_date, iv.reusable_pallet_id, iv.remark
+        from
+        (
+          select ih.domain_id, ih.pallet_id, sum(ih.qty) as qty, sum(ih.uom_value) as uom_value, max(ih.seq) as last_seq, max(ih.created_at) as created_at,
+          min(ih.created_at) as initial_inbound_at
+          from tmp_src ih
+          group by ih.domain_id, ih.pallet_id
+        ) dt
+        inner join tmp_src rih on dt.domain_id = rih.domain_id and dt.pallet_id = rih.pallet_id and dt.last_seq = rih.seq and rih.status <> 'TERMINATED'
+        inner join inventories iv on iv.domain_id = dt.domain_id and iv.pallet_id = dt.pallet_id
+        where exists (
+          SELECT * FROM tmp_bizfilter bizFilter
+          WHERE bizFilter.bizplace_id = "rih"."bizplace_id"
+        )
+        ${queryFilter}
+        ${expirationQueryFilter}
+      );
+    `);
+    const total = await tx.query(`select count(*) from tmp_data`);
+    const result = await tx.query(` 
+        select 
+        rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", rih.uom_value as "uomValue", rih.uom, rih.last_seq, rih.created_at,
+        rih.initial_inbound_at as "initialInboundAt",
+        case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
+        rih.batch_id_ref as "batchIdRef", rih.product_id, rih.packing_type as "packingType", rih.bizplace_id, rih.location_id,
+        prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.description as product_description,
+        bz.id as bizplace_id, bz.name as bizplace_name, 
+        loc.id as location_id, loc.name as location_name, loc."zone" as location_zone, loc."row" as location_row, loc."column" as location_column, loc.shelf as location_shelf,
+        wh.name as warehouse_name, plt.name as reusable_pallet_name,
+        rih.remark,
+        rih.expiration_date as "expirationDate"
+        from tmp_data rih
+        left join pallets plt on plt.id = rih.reusable_pallet_id
+        inner join products prd on prd.id = rih.product_id
+        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
+        WHERE 1 = 1
+        ${queryOrder}
+        ${setPagination ? 'OFFSET ' + (pagination.page - 1) * pagination.limit + ' LIMIT ' + pagination.limit : ''}
+        ;
+    `);
+    // map all results
+    let items = result.map(itm => {
+        return Object.assign(Object.assign({}, itm), { bizplace: {
+                id: itm.bizplace_id,
+                name: itm.bizplace_name
+            }, location: {
+                id: itm.location_id,
+                name: itm.location_name,
+                type: itm.location_type,
+                zone: itm.location_zone
+            }, product: {
+                id: itm.product_id,
+                name: itm.product_name,
+                description: itm.product_description,
+                sku: itm.product_sku
+            } });
+    });
+    return { items, total: total[0].count };
+}
+exports.onhandInventories = onhandInventories;
 //# sourceMappingURL=onhand-inventories.js.map

package/dist-server/graphql/resolvers/inventory-history/onhand-inventories.js.map

@@ -1 +1 @@
-{"version":3,"file":"onhand-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory-history/onhand-inventories.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onhand-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory-history/onhand-inventories.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/types/inventory/index.js

@@ -45,7 +45,7 @@ exports.Query = `
   inventory(palletId: String!): Inventory @privilege(category: "inventory", privilege: "query") 
   inventoryByPallet(palletId: String!): Inventory @privilege(category: "inventory", privilege: "query") 
   inventoriesByProduct(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InventoryList @privilege(category: "inventory", privilege: "query") @transaction
-  inventoriesByStrategy(worksheetId: String!, batchId: String!, bizplaceId: String, productName: String!, productSku: String!, packingType: String!, pickingStrategy: String! locationSortingRules: [Sorting]): InventoryList @transaction
+  inventoriesByStrategy(worksheetId: String!, batchId: String!, bizplaceId: String, productName: String!, productSku: String!, packingType: String!, packingSize: Float!, uom: String!, pickingStrategy: String! locationSortingRules: [Sorting]): InventoryList @transaction
   checkProductIdenticality(palletA: String!, palletB: String!): Boolean @transaction
   checkCartonIdenticality(cartonA: String!, palletA: String!, cartonB: String!): Boolean
   checkInventoryOwner(palletId: String!, bizplaceName: String!): Boolean

package/dist-server/graphql/types/inventory/inventory-bundle-group.js

@@ -25,6 +25,7 @@ exports.InventoryBundleGroup = (0, graphql_tag_1.default) `
     releaseQty: Int
     remainUomValue: Float
     lockedUomValue: Float
+    uom: String
     releaseUomValue: Float
     releaseUomValueWithUom: String
     packingType: String

package/dist-server/graphql/types/inventory/inventory-bundle-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"inventory-bundle-group.js","sourceRoot":"","sources":["../../../../server/graphql/types/inventory/inventory-bundle-group.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BtC,CAAA"}
+{"version":3,"file":"inventory-bundle-group.js","sourceRoot":"","sources":["../../../../server/graphql/types/inventory/inventory-bundle-group.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BtC,CAAA"}

package/dist-server/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateWarehouse = exports.deleteWarehouses = exports.deleteWarehouse = exports.createWarehouse = exports.updateLocation = exports.deleteLocations = exports.deleteLocation = exports.createLocation = void 0;
+exports.onhandInventories = exports.updateWarehouse = exports.deleteWarehouses = exports.deleteWarehouse = exports.createWarehouse = exports.updateLocation = exports.deleteLocations = exports.deleteLocation = exports.createLocation = void 0;
 __exportStar(require("./constants"), exports);
 __exportStar(require("./entities"), exports);
 __exportStar(require("./graphql"), exports);
@@ -24,6 +24,8 @@ Object.defineProperty(exports, "createWarehouse", { enumerable: true, get: funct
 Object.defineProperty(exports, "deleteWarehouse", { enumerable: true, get: function () { return warehouse_1.deleteWarehouse; } });
 Object.defineProperty(exports, "deleteWarehouses", { enumerable: true, get: function () { return warehouse_1.deleteWarehouses; } });
 Object.defineProperty(exports, "updateWarehouse", { enumerable: true, get: function () { return warehouse_1.updateWarehouse; } });
+var onhand_inventories_1 = require("./graphql/resolvers/inventory-history/onhand-inventories");
+Object.defineProperty(exports, "onhandInventories", { enumerable: true, get: function () { return onhand_inventories_1.onhandInventories; } });
 __exportStar(require("./migrations"), exports);
 __exportStar(require("./utils"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,yDAA8G;AAArG,0GAAA,cAAc,OAAA;AAAE,0GAAA,cAAc,OAAA;AAAE,2GAAA,eAAe,OAAA;AAAE,0GAAA,cAAc,OAAA;AACxE,2DAAmH;AAA1G,4GAAA,eAAe,OAAA;AAAE,4GAAA,eAAe,OAAA;AAAE,6GAAA,gBAAgB,OAAA;AAAE,4GAAA,eAAe,OAAA;AAC5E,+CAA4B;AAC5B,0CAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,yDAA8G;AAArG,0GAAA,cAAc,OAAA;AAAE,0GAAA,cAAc,OAAA;AAAE,2GAAA,eAAe,OAAA;AAAE,0GAAA,cAAc,OAAA;AACxE,2DAAmH;AAA1G,4GAAA,eAAe,OAAA;AAAE,4GAAA,eAAe,OAAA;AAAE,6GAAA,gBAAgB,OAAA;AAAE,4GAAA,eAAe,OAAA;AAC5E,+FAA4F;AAAnF,uHAAA,iBAAiB,OAAA;AAC1B,+CAA4B;AAC5B,0CAAuB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "3.7.1",
+  "version": "3.7.6",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,12 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^3.7.0",
-    "@things-factory/id-rule-base": "^3.7.0",
-    "@things-factory/integration-sellercraft": "^3.7.0",
-    "@things-factory/marketplace-base": "^3.7.1",
-    "@things-factory/product-base": "^3.7.0",
-    "@things-factory/setting-base": "^3.7.0"
+    "@things-factory/biz-base": "^3.7.5",
+    "@things-factory/id-rule-base": "^3.7.6",
+    "@things-factory/integration-sellercraft": "^3.7.5",
+    "@things-factory/marketplace-base": "^3.7.6",
+    "@things-factory/product-base": "^3.7.5",
+    "@things-factory/setting-base": "^3.7.5"
   },
-  "gitHead": "85a0f0538a372cd24cb9271e6071cde2e09c4480"
+  "gitHead": "d9d72c07fc3b01af2ede46808ec0aced3241ed51"
 }

package/server/graphql/resolvers/inventory/inventories-by-bundle.ts

@@ -1,9 +1,11 @@
+import { getRepository, SelectQueryBuilder } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { ProductBundleSetting } from '@things-factory/product-base'
 import { buildQuery, Domain } from '@things-factory/shell'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+
 import { Inventory } from '../../../entities'
-import { ProductBundleSetting } from '@things-factory/product-base'
 
 export const inventoriesByBundleResolver = {
   async inventoriesByBundle(_: any, { filters, pagination, sortings }, context: any) {
@@ -70,6 +72,7 @@ export const inventoriesByBundleResolver = {
       .addSelect('iv.batch_id', 'batchId')
       .addSelect('iv.batch_id_ref', 'batchIdRef')
       .addSelect('iv.packing_type', 'packingType')
+      .addSelect('iv.uom', 'uom')
       .addSelect('SUM(iv.qty)', 'qty')
       .addSelect('SUM(iv.locked_qty)', 'lockedQty')
       .addSelect('SUM(iv.uom_value)', 'uomValue')
@@ -78,7 +81,7 @@ export const inventoriesByBundleResolver = {
       .addSelect('prd.name', 'productName')
       .addSelect('prd.description', 'productDescription')
       .addSelect('prd.type', 'productType')
-      .addSelect('prd.primary_unit', 'uom')
+      // .addSelect('prd.primary_unit', 'productUom')
       .leftJoin('iv.product', 'prd')
 
     if (remainOnly) {
@@ -98,12 +101,13 @@ export const inventoriesByBundleResolver = {
       .addGroupBy('iv.batch_id')
       .addGroupBy('iv.batch_id_ref')
       .addGroupBy('iv.packing_type')
+      .addGroupBy('iv.uom')
       .addGroupBy('prd.sku')
       .addGroupBy('prd.name')
       .addGroupBy('prd.description')
       .addGroupBy('prd.type')
       .addOrderBy('prd.name')
-      .addGroupBy('prd.primary_unit')
+      // .addGroupBy('prd.primary_unit')
       .addOrderBy('iv.batch_id')
 
     let bundleGroup = await qb.getRawMany()
@@ -114,6 +118,7 @@ export const inventoriesByBundleResolver = {
         bundleId: productBundleId,
         remainQty: item.qty - (item.lockedQty ? item.lockedQty : 0),
         remainUomValue: item.uomValue - (item.lockedUomValue ? item.lockedUomValue : 0),
+        // productUom: item.productUom,
         uom: item.uom,
         bundleQty: productBundleSettings.filter(pbs => pbs.product.id === item.productId)[0].bundleQty
       }