@things-factory/warehouse-base 3.7.9 → 3.7.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/graphql/resolvers/inventory/inventories-by-product.js +6 -2
- package/dist-server/graphql/resolvers/inventory/inventories-by-product.js.map +1 -1
- package/dist-server/graphql/resolvers/inventory/inventories.js +2 -1
- package/dist-server/graphql/resolvers/inventory/inventories.js.map +1 -1
- package/dist-server/graphql/resolvers/inventory-history/bizplace-inventory-histories.js +2 -1
- package/dist-server/graphql/resolvers/inventory-history/bizplace-inventory-histories.js.map +1 -1
- package/dist-server/graphql/resolvers/inventory-history/onhand-inventories.js +4 -2
- package/dist-server/graphql/resolvers/inventory-history/onhand-inventories.js.map +1 -1
- package/dist-server/graphql/types/inventory/inventory.js +1 -0
- package/dist-server/graphql/types/inventory/inventory.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/inventory/inventories-by-product.ts +38 -31
- package/server/graphql/resolvers/inventory/inventories.ts +1 -0
- package/server/graphql/resolvers/inventory-history/bizplace-inventory-histories.ts +1 -0
- package/server/graphql/resolvers/inventory-history/onhand-inventories.ts +4 -2
- package/server/graphql/types/inventory/inventory.ts +1 -0
|
@@ -53,6 +53,7 @@ exports.inventoriesByProduct = {
|
|
|
53
53
|
productQuery = `AND (
|
|
54
54
|
Lower("Product"."name") LIKE ANY(ARRAY[${productValue}])
|
|
55
55
|
OR Lower("Product"."sku") LIKE ANY(ARRAY[${productValue}])
|
|
56
|
+
OR Lower("Product"."brand") LIKE ANY(ARRAY[${productValue}])
|
|
56
57
|
OR Lower("Product"."description") LIKE ANY(ARRAY[${productValue}])
|
|
57
58
|
OR Lower("ProductRef"."name") LIKE ANY(ARRAY[${productValue}])
|
|
58
59
|
OR Lower("ProductRef"."sku") LIKE ANY(ARRAY[${productValue}])
|
|
@@ -67,7 +68,9 @@ exports.inventoriesByProduct = {
|
|
|
67
68
|
return "'%" + prod.trim().replace(/'/g, "''") + "%'";
|
|
68
69
|
})
|
|
69
70
|
.join(',');
|
|
70
|
-
productQuery =
|
|
71
|
+
productQuery =
|
|
72
|
+
productQuery +
|
|
73
|
+
` AND (
|
|
71
74
|
Lower("Product"."type") LIKE ANY(ARRAY[${productTypeValue}])
|
|
72
75
|
)`;
|
|
73
76
|
}
|
|
@@ -86,7 +89,7 @@ exports.inventoriesByProduct = {
|
|
|
86
89
|
await tx.query(`
|
|
87
90
|
create temp table temp_inv_history AS
|
|
88
91
|
(
|
|
89
|
-
SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description",
|
|
92
|
+
SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."brand" AS "brand", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description",
|
|
90
93
|
"Product"."weight" AS "weight", "ProductRef"."name" AS "productRefName",
|
|
91
94
|
"ProductRef"."description" AS "productRefDesciption", "Bizplace"."name" AS "bizplaceName", SUM("Inventory"."qty") AS "qty" ,
|
|
92
95
|
CASE WHEN SUM("Inventory"."qty") > 0 THEN SUM(COALESCE("Inventory"."unit_cost", 0) * "Inventory"."qty")/ SUM("Inventory"."qty") ELSE 0 END AS "averageUnitCost",
|
|
@@ -123,6 +126,7 @@ exports.inventoriesByProduct = {
|
|
|
123
126
|
id: item.id,
|
|
124
127
|
name: item.name,
|
|
125
128
|
sku: item.sku,
|
|
129
|
+
brand: item.brand,
|
|
126
130
|
description: item.description,
|
|
127
131
|
type: item.type,
|
|
128
132
|
weight: item.weight,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventories-by-product.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory/inventories-by-product.ts"],"names":[],"mappings":";;;AACA,uDAAyG;AAGzG,qCAA0E;AAG7D,QAAA,oBAAoB,GAAG;IAClC,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAChE,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;YAC7F,IAAI,oBAAoB,GAAa,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAChF,MAAM,wBAAwB,GAAe,MAAM,IAAA,sCAA2B,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAE5F,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAA;YACnC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAA;YAErC,IAAI,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"inventories-by-product.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory/inventories-by-product.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,8 @@ exports.inventoriesResolver = {
|
|
|
61
61
|
.andWhere(new typeorm_1.Brackets(qb => {
|
|
62
62
|
qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
|
|
63
63
|
.orWhere('Lower(products.name) LIKE :productInfo', { productInfo: productFilterValue })
|
|
64
|
-
.orWhere('Lower(products.description) LIKE :productInfo', { productInfo: productFilterValue })
|
|
64
|
+
.orWhere('Lower(products.description) LIKE :productInfo', { productInfo: productFilterValue })
|
|
65
|
+
.orWhere('Lower(products.brand) LIKE :productInfo', { productInfo: productFilterValue });
|
|
65
66
|
}))
|
|
66
67
|
.getQuery();
|
|
67
68
|
return `EXISTS ${subQuery}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory/inventories.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory/inventories.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,8 @@ exports.bizplaceInventoryHistories = {
|
|
|
23
23
|
productQb.where(new typeorm_1.Brackets(qb => {
|
|
24
24
|
qb.where('Lower(prd.sku) LIKE :productInfo', { productInfo: productFilterValue })
|
|
25
25
|
.orWhere('Lower(prd.name) LIKE :productInfo', { productInfo: productFilterValue })
|
|
26
|
-
.orWhere('Lower(prd.description) LIKE :productInfo', { productInfo: productFilterValue })
|
|
26
|
+
.orWhere('Lower(prd.description) LIKE :productInfo', { productInfo: productFilterValue })
|
|
27
|
+
.orWhere('Lower(prd.brand) LIKE :productInfo', { productInfo: productFilterValue });
|
|
27
28
|
}));
|
|
28
29
|
const _products = await productQb.getMany();
|
|
29
30
|
where['product'] = (0, typeorm_1.In)(_products.map((product) => product.id));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bizplace-inventory-histories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory-history/bizplace-inventory-histories.ts"],"names":[],"mappings":";;;AACA,uDAAkE;AAClE,+DAAsD;AACtD,iDAAiE;AACjE,qCAAsG;AACtG,gDAAyE;AAE5D,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,OAAY;QACxG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,aAAa,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACjE,MAAM,gBAAgB,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAEzG,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAA;QAClE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAA;QAEvD,MAAM,QAAQ,GAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QAC1D,MAAM,MAAM,GAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAEtD,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC5E,IAAI,KAAK,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;QAE9B,IAAI,cAAc,EAAE;YAClB,IAAI,kBAAkB,GAAG,IAAI,cAAc,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAA;YAClE,MAAM,SAAS,GAAgC,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;YAE/F,SAAS,CAAC,KAAK,CACb,IAAI,kBAAQ,CAAC,EAAE,CAAC,EAAE;gBAChB,EAAE,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;qBAC9E,OAAO,CAAC,mCAAmC,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;qBACjF,OAAO,CAAC,0CAA0C,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"bizplace-inventory-histories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory-history/bizplace-inventory-histories.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,8 @@ async function onhandInventories(filters, pagination, sortings, locationSortingR
|
|
|
69
69
|
)
|
|
70
70
|
and (lower(prd.name) like any(array[${products}])
|
|
71
71
|
or lower(prd.description) like any(array[${products}])
|
|
72
|
-
or lower(prd.sku) like any(array[${products}])
|
|
72
|
+
or lower(prd.sku) like any(array[${products}])
|
|
73
|
+
or lower(prd.brand) like any(array[${products}]))
|
|
73
74
|
and prd.id = rih.product_id
|
|
74
75
|
group by prd.id
|
|
75
76
|
)`;
|
|
@@ -160,7 +161,7 @@ async function onhandInventories(filters, pagination, sortings, locationSortingR
|
|
|
160
161
|
rih.initial_inbound_at as "initialInboundAt",
|
|
161
162
|
case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
|
|
162
163
|
rih.batch_id_ref as "batchIdRef", rih.product_id, rih.packing_type as "packingType", rih.bizplace_id, rih.location_id,
|
|
163
|
-
prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.description as product_description,
|
|
164
|
+
prd.id as product_id, prd.name as product_name, prd.brand as product_brand, prd.sku as product_sku, prd.description as product_description,
|
|
164
165
|
bz.id as bizplace_id, bz.name as bizplace_name,
|
|
165
166
|
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,
|
|
166
167
|
wh.name as warehouse_name, plt.name as reusable_pallet_name,
|
|
@@ -190,6 +191,7 @@ async function onhandInventories(filters, pagination, sortings, locationSortingR
|
|
|
190
191
|
}, product: {
|
|
191
192
|
id: itm.product_id,
|
|
192
193
|
name: itm.product_name,
|
|
194
|
+
brand: itm.product_brand,
|
|
193
195
|
description: itm.product_description,
|
|
194
196
|
sku: itm.product_sku
|
|
195
197
|
} });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onhand-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory-history/onhand-inventories.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"onhand-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/inventory-history/onhand-inventories.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory.js","sourceRoot":"","sources":["../../../../server/graphql/types/inventory/inventory.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,SAAS,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"inventory.js","sourceRoot":"","sources":["../../../../server/graphql/types/inventory/inventory.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,SAAS,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgD3B,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/warehouse-base",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.13",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"@things-factory/biz-base": "^3.7.5",
|
|
28
28
|
"@things-factory/id-rule-base": "^3.7.6",
|
|
29
29
|
"@things-factory/integration-sellercraft": "^3.7.7",
|
|
30
|
-
"@things-factory/marketplace-base": "^3.7.
|
|
31
|
-
"@things-factory/product-base": "^3.7.
|
|
30
|
+
"@things-factory/marketplace-base": "^3.7.11",
|
|
31
|
+
"@things-factory/product-base": "^3.7.13",
|
|
32
32
|
"@things-factory/setting-base": "^3.7.5"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "48a64e051ed22ee4f0cbf11052a96bd17eef3b0d"
|
|
35
35
|
}
|
|
@@ -13,33 +13,33 @@ export const inventoriesByProduct = {
|
|
|
13
13
|
const partnersCompanyBizplaces: Bizplace[] = await getPartnersCompanyBizplaces(domain, user)
|
|
14
14
|
|
|
15
15
|
const page = params.pagination.page
|
|
16
|
-
const limit = params.pagination.limit
|
|
17
|
-
|
|
18
|
-
let bizplaceFilter = params.filters.find(filter=>filter.name =='bizplace')
|
|
19
|
-
let productFilter = params.filters.find(filter=>filter.name =='product')
|
|
20
|
-
let productTypeFilter = params.filters.find(filter=>filter.name =='type')
|
|
21
|
-
let availableStockFilter = params.filters.find(filter=>filter.name =='availableStock')
|
|
22
|
-
let lowStockFilter = params.filters.find(filter=>filter.name =='lowStock')
|
|
23
|
-
let overStockFilter = params.filters.find(filter=>filter.name =='overStock')
|
|
24
|
-
|
|
25
|
-
if(bizplaceFilter){
|
|
16
|
+
const limit = params.pagination.limit
|
|
17
|
+
|
|
18
|
+
let bizplaceFilter = params.filters.find(filter => filter.name == 'bizplace')
|
|
19
|
+
let productFilter = params.filters.find(filter => filter.name == 'product')
|
|
20
|
+
let productTypeFilter = params.filters.find(filter => filter.name == 'type')
|
|
21
|
+
let availableStockFilter = params.filters.find(filter => filter.name == 'availableStock')
|
|
22
|
+
let lowStockFilter = params.filters.find(filter => filter.name == 'lowStock')
|
|
23
|
+
let overStockFilter = params.filters.find(filter => filter.name == 'overStock')
|
|
24
|
+
|
|
25
|
+
if (bizplaceFilter) {
|
|
26
26
|
const bizplaceQueryBuilder: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('b')
|
|
27
27
|
bizplaceQueryBuilder
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
.innerJoin('companies', 'c2', ' c2.domain_id = b.domain_id')
|
|
29
|
+
.innerJoin('bizplaces', 'b2', 'b2.company_id = c2.id')
|
|
30
|
+
.where('b2.id = :bizplaceId', { bizplaceId: bizplaceFilter.value })
|
|
31
31
|
|
|
32
32
|
let bizplaceList = await bizplaceQueryBuilder.getMany()
|
|
33
|
-
|
|
33
|
+
|
|
34
34
|
permittedBizplaceIds = [
|
|
35
35
|
...permittedBizplaceIds.filter(itm => itm == bizplaceFilter.value),
|
|
36
|
-
...bizplaceList.map(bz=>bz.id),
|
|
37
|
-
...partnersCompanyBizplaces.map(biz=>biz.id)
|
|
36
|
+
...bizplaceList.map(bz => bz.id),
|
|
37
|
+
...partnersCompanyBizplaces.map(biz => biz.id)
|
|
38
38
|
]
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
let bizplaceQuery = ''
|
|
42
|
-
if(permittedBizplaceIds.length > 0){
|
|
42
|
+
if (permittedBizplaceIds.length > 0) {
|
|
43
43
|
bizplaceQuery = `AND EXISTS (
|
|
44
44
|
SELECT * FROM (VALUES ${permittedBizplaceIds.map(id => `('${id}')`).join(',')})
|
|
45
45
|
AS bizFilter(bizplace_id)
|
|
@@ -61,6 +61,7 @@ export const inventoriesByProduct = {
|
|
|
61
61
|
productQuery = `AND (
|
|
62
62
|
Lower("Product"."name") LIKE ANY(ARRAY[${productValue}])
|
|
63
63
|
OR Lower("Product"."sku") LIKE ANY(ARRAY[${productValue}])
|
|
64
|
+
OR Lower("Product"."brand") LIKE ANY(ARRAY[${productValue}])
|
|
64
65
|
OR Lower("Product"."description") LIKE ANY(ARRAY[${productValue}])
|
|
65
66
|
OR Lower("ProductRef"."name") LIKE ANY(ARRAY[${productValue}])
|
|
66
67
|
OR Lower("ProductRef"."sku") LIKE ANY(ARRAY[${productValue}])
|
|
@@ -68,7 +69,7 @@ export const inventoriesByProduct = {
|
|
|
68
69
|
)`
|
|
69
70
|
}
|
|
70
71
|
|
|
71
|
-
if(productTypeFilter){
|
|
72
|
+
if (productTypeFilter) {
|
|
72
73
|
let productTypeValue = productTypeFilter.value
|
|
73
74
|
.toLowerCase()
|
|
74
75
|
.split(',')
|
|
@@ -76,30 +77,33 @@ export const inventoriesByProduct = {
|
|
|
76
77
|
return "'%" + prod.trim().replace(/'/g, "''") + "%'"
|
|
77
78
|
})
|
|
78
79
|
.join(',')
|
|
79
|
-
productQuery =
|
|
80
|
+
productQuery =
|
|
81
|
+
productQuery +
|
|
82
|
+
` AND (
|
|
80
83
|
Lower("Product"."type") LIKE ANY(ARRAY[${productTypeValue}])
|
|
81
84
|
)`
|
|
82
85
|
}
|
|
83
86
|
|
|
84
87
|
let availableStockQuery = ''
|
|
85
|
-
if(availableStockFilter?.value){
|
|
88
|
+
if (availableStockFilter?.value) {
|
|
86
89
|
availableStockQuery = ` AND SUM("Inventory"."qty") > 0`
|
|
87
90
|
}
|
|
88
91
|
|
|
89
92
|
let thresholdQuery = ''
|
|
90
|
-
if(lowStockFilter?.value){
|
|
93
|
+
if (lowStockFilter?.value) {
|
|
91
94
|
thresholdQuery = `AND COALESCE("ProductDetailBizplaceSetting"."min_qty", "Product"."min_qty",0) > SUM("Inventory"."qty")`
|
|
92
95
|
}
|
|
93
96
|
|
|
94
|
-
if(overStockFilter?.value){
|
|
97
|
+
if (overStockFilter?.value) {
|
|
95
98
|
thresholdQuery = `AND COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0) > 0 AND
|
|
96
99
|
COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0) < SUM("Inventory"."qty")`
|
|
97
100
|
}
|
|
98
101
|
|
|
99
|
-
await tx.query(
|
|
102
|
+
await tx.query(
|
|
103
|
+
`
|
|
100
104
|
create temp table temp_inv_history AS
|
|
101
105
|
(
|
|
102
|
-
SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description",
|
|
106
|
+
SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."brand" AS "brand", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description",
|
|
103
107
|
"Product"."weight" AS "weight", "ProductRef"."name" AS "productRefName",
|
|
104
108
|
"ProductRef"."description" AS "productRefDesciption", "Bizplace"."name" AS "bizplaceName", SUM("Inventory"."qty") AS "qty" ,
|
|
105
109
|
CASE WHEN SUM("Inventory"."qty") > 0 THEN SUM(COALESCE("Inventory"."unit_cost", 0) * "Inventory"."qty")/ SUM("Inventory"."qty") ELSE 0 END AS "averageUnitCost",
|
|
@@ -121,18 +125,21 @@ export const inventoriesByProduct = {
|
|
|
121
125
|
HAVING 1 = 1
|
|
122
126
|
${availableStockQuery}
|
|
123
127
|
${thresholdQuery}
|
|
124
|
-
)`,
|
|
128
|
+
)`,
|
|
129
|
+
[domain.id]
|
|
125
130
|
)
|
|
126
131
|
|
|
127
|
-
const results: any = await tx.query(
|
|
132
|
+
const results: any = await tx.query(
|
|
133
|
+
`
|
|
128
134
|
SELECT * FROM temp_inv_history
|
|
129
135
|
ORDER BY "bizplaceName", "sku"
|
|
130
136
|
OFFSET $1 LIMIT $2
|
|
131
|
-
`,
|
|
137
|
+
`,
|
|
138
|
+
[(page - 1) * limit, limit]
|
|
132
139
|
)
|
|
133
140
|
|
|
134
141
|
const total: any = await tx.query(`SELECT COUNT(*) FROM temp_inv_history`)
|
|
135
|
-
|
|
142
|
+
|
|
136
143
|
tx.query(`drop table temp_inv_history`)
|
|
137
144
|
|
|
138
145
|
return {
|
|
@@ -142,6 +149,7 @@ export const inventoriesByProduct = {
|
|
|
142
149
|
id: item.id,
|
|
143
150
|
name: item.name,
|
|
144
151
|
sku: item.sku,
|
|
152
|
+
brand: item.brand,
|
|
145
153
|
description: item.description,
|
|
146
154
|
type: item.type,
|
|
147
155
|
weight: item.weight,
|
|
@@ -154,11 +162,10 @@ export const inventoriesByProduct = {
|
|
|
154
162
|
qty: item.qty
|
|
155
163
|
}
|
|
156
164
|
}),
|
|
157
|
-
total: total[0].count
|
|
165
|
+
total: total[0].count
|
|
158
166
|
}
|
|
159
|
-
|
|
160
167
|
} catch (error) {
|
|
161
|
-
throw error
|
|
168
|
+
throw error
|
|
162
169
|
}
|
|
163
170
|
}
|
|
164
171
|
}
|
|
@@ -82,6 +82,7 @@ export const inventoriesResolver = {
|
|
|
82
82
|
qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
|
|
83
83
|
.orWhere('Lower(products.name) LIKE :productInfo', { productInfo: productFilterValue })
|
|
84
84
|
.orWhere('Lower(products.description) LIKE :productInfo', { productInfo: productFilterValue })
|
|
85
|
+
.orWhere('Lower(products.brand) LIKE :productInfo', { productInfo: productFilterValue })
|
|
85
86
|
})
|
|
86
87
|
)
|
|
87
88
|
.getQuery()
|
|
@@ -30,6 +30,7 @@ export const bizplaceInventoryHistories = {
|
|
|
30
30
|
qb.where('Lower(prd.sku) LIKE :productInfo', { productInfo: productFilterValue })
|
|
31
31
|
.orWhere('Lower(prd.name) LIKE :productInfo', { productInfo: productFilterValue })
|
|
32
32
|
.orWhere('Lower(prd.description) LIKE :productInfo', { productInfo: productFilterValue })
|
|
33
|
+
.orWhere('Lower(prd.brand) LIKE :productInfo', { productInfo: productFilterValue })
|
|
33
34
|
})
|
|
34
35
|
)
|
|
35
36
|
|
|
@@ -89,7 +89,8 @@ export async function onhandInventories(
|
|
|
89
89
|
)
|
|
90
90
|
and (lower(prd.name) like any(array[${products}])
|
|
91
91
|
or lower(prd.description) like any(array[${products}])
|
|
92
|
-
or lower(prd.sku) like any(array[${products}])
|
|
92
|
+
or lower(prd.sku) like any(array[${products}])
|
|
93
|
+
or lower(prd.brand) like any(array[${products}]))
|
|
93
94
|
and prd.id = rih.product_id
|
|
94
95
|
group by prd.id
|
|
95
96
|
)`
|
|
@@ -198,7 +199,7 @@ export async function onhandInventories(
|
|
|
198
199
|
rih.initial_inbound_at as "initialInboundAt",
|
|
199
200
|
case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
|
|
200
201
|
rih.batch_id_ref as "batchIdRef", rih.product_id, rih.packing_type as "packingType", rih.bizplace_id, rih.location_id,
|
|
201
|
-
prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.description as product_description,
|
|
202
|
+
prd.id as product_id, prd.name as product_name, prd.brand as product_brand, prd.sku as product_sku, prd.description as product_description,
|
|
202
203
|
bz.id as bizplace_id, bz.name as bizplace_name,
|
|
203
204
|
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,
|
|
204
205
|
wh.name as warehouse_name, plt.name as reusable_pallet_name,
|
|
@@ -234,6 +235,7 @@ export async function onhandInventories(
|
|
|
234
235
|
product: {
|
|
235
236
|
id: itm.product_id,
|
|
236
237
|
name: itm.product_name,
|
|
238
|
+
brand: itm.product_brand,
|
|
237
239
|
description: itm.product_description,
|
|
238
240
|
sku: itm.product_sku
|
|
239
241
|
}
|