@things-factory/product-base 4.3.318 → 4.3.357
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.
|
@@ -50,11 +50,16 @@ let ProductDetailQuery = class ProductDetailQuery {
|
|
|
50
50
|
const { domain, user } = context.state;
|
|
51
51
|
const { domains } = user;
|
|
52
52
|
const params = { filters, pagination };
|
|
53
|
-
const productInfoFilters = params.filters.find(x => x.name == 'product_info' ||
|
|
53
|
+
const productInfoFilters = params.filters.find(x => x.name == 'product_info' ||
|
|
54
|
+
x.name == 'sku' ||
|
|
55
|
+
x.name == 'name' ||
|
|
56
|
+
x.name == 'description' ||
|
|
57
|
+
x.name == 'type' ||
|
|
58
|
+
x.name == 'brandSku');
|
|
54
59
|
const bizplaceFilter = params.filters.find(x => x.name == 'bizplace_id');
|
|
55
60
|
const productFilter = params.filters.find(x => x.name == 'product');
|
|
56
61
|
const createArrivalNotice = params.filters.find(x => x.name == 'create_arrival_notice');
|
|
57
|
-
const productInfoFilterColumns = ['sku', 'name', 'description', 'type', 'brand'];
|
|
62
|
+
const productInfoFilterColumns = ['sku', 'name', 'description', 'type', 'brand', 'brandSku'];
|
|
58
63
|
params.filters = params.filters.filter(x => x.name != 'product_info' &&
|
|
59
64
|
x.name != 'bizplace_id' &&
|
|
60
65
|
x.name != 'product' &&
|
|
@@ -63,6 +68,7 @@ let ProductDetailQuery = class ProductDetailQuery {
|
|
|
63
68
|
x.name != 'name' &&
|
|
64
69
|
x.name != 'description' &&
|
|
65
70
|
x.name != 'type' &&
|
|
71
|
+
x.name != 'brandSku' &&
|
|
66
72
|
x.name != 'create_arrival_notice');
|
|
67
73
|
const qb = (0, typeorm_1.getRepository)(product_detail_1.ProductDetail).createQueryBuilder('ProductDetail');
|
|
68
74
|
qb.innerJoinAndSelect('ProductDetail.product', 'Product', '"Product"."deleted_at" IS NULL');
|
|
@@ -125,7 +131,7 @@ let ProductDetailQuery = class ProductDetailQuery {
|
|
|
125
131
|
}
|
|
126
132
|
let [items, total] = await qb.getManyAndCount();
|
|
127
133
|
items = items.map(item => {
|
|
128
|
-
return Object.assign(Object.assign({}, item), { productId: item.product.id, name: item.name, description: item.product.description, type: item.product.type, sku: item.product.sku, brand: item.product.brand, isRequireSerialNumberScanningInbound: item.product.isRequireSerialNumberScanningInbound, isRequireSerialNumberScanningOutbound: item.product.isRequireSerialNumberScanningOutbound, costPrice: (item === null || item === void 0 ? void 0 : item.costPrice) || (item === null || item === void 0 ? void 0 : item.costPrice) == 0 ? parseFloat(item.costPrice.toFixed(2)) : null });
|
|
134
|
+
return Object.assign(Object.assign({}, item), { productId: item.product.id, name: item.name, description: item.product.description, type: item.product.type, sku: item.product.sku, brand: item.product.brand, brandSku: item.product.brandSku, isRequireSerialNumberScanningInbound: item.product.isRequireSerialNumberScanningInbound, isRequireSerialNumberScanningOutbound: item.product.isRequireSerialNumberScanningOutbound, costPrice: (item === null || item === void 0 ? void 0 : item.costPrice) || (item === null || item === void 0 ? void 0 : item.costPrice) == 0 ? parseFloat(item.costPrice.toFixed(2)) : null });
|
|
129
135
|
});
|
|
130
136
|
return { items, total };
|
|
131
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-detail-query.js","sourceRoot":"","sources":["../../../server/service/product-detail/product-detail-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"product-detail-query.js","sourceRoot":"","sources":["../../../server/service/product-detail/product-detail-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/product-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.357",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@things-factory/biz-base": "^4.3.
|
|
27
|
-
"@things-factory/routing-base": "^4.3.
|
|
26
|
+
"@things-factory/biz-base": "^4.3.344",
|
|
27
|
+
"@things-factory/routing-base": "^4.3.344"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "b3e5c3df67198d03dd9d038d860b993423a07f04"
|
|
30
30
|
}
|
|
@@ -1,32 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
Ctx,
|
|
4
|
-
Directive,
|
|
5
|
-
FieldResolver,
|
|
6
|
-
Query,
|
|
7
|
-
Resolver,
|
|
8
|
-
Root
|
|
9
|
-
} from 'type-graphql'
|
|
10
|
-
import {
|
|
11
|
-
Brackets,
|
|
12
|
-
getRepository,
|
|
13
|
-
SelectQueryBuilder
|
|
14
|
-
} from 'typeorm'
|
|
1
|
+
import { Arg, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
|
|
2
|
+
import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
|
|
15
3
|
|
|
16
4
|
import { User } from '@things-factory/auth-base'
|
|
17
|
-
import {
|
|
18
|
-
|
|
19
|
-
getCompaniesBizplaces,
|
|
20
|
-
getPartnersCompanyBizplaces
|
|
21
|
-
} from '@things-factory/biz-base'
|
|
22
|
-
import {
|
|
23
|
-
buildCondition,
|
|
24
|
-
buildQuery,
|
|
25
|
-
Domain,
|
|
26
|
-
Filter,
|
|
27
|
-
Pagination,
|
|
28
|
-
Sorting
|
|
29
|
-
} from '@things-factory/shell'
|
|
5
|
+
import { Bizplace, getCompaniesBizplaces, getPartnersCompanyBizplaces } from '@things-factory/biz-base'
|
|
6
|
+
import { buildCondition, buildQuery, Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
|
|
30
7
|
|
|
31
8
|
import { ProductBarcode } from '../product-barcode/product-barcode'
|
|
32
9
|
import { ProductDetail } from './product-detail'
|
|
@@ -77,13 +54,18 @@ export class ProductDetailQuery {
|
|
|
77
54
|
const params = { filters, pagination }
|
|
78
55
|
const productInfoFilters = params.filters.find(
|
|
79
56
|
x =>
|
|
80
|
-
x.name == 'product_info' ||
|
|
57
|
+
x.name == 'product_info' ||
|
|
58
|
+
x.name == 'sku' ||
|
|
59
|
+
x.name == 'name' ||
|
|
60
|
+
x.name == 'description' ||
|
|
61
|
+
x.name == 'type' ||
|
|
62
|
+
x.name == 'brandSku'
|
|
81
63
|
)
|
|
82
64
|
|
|
83
65
|
const bizplaceFilter = params.filters.find(x => x.name == 'bizplace_id')
|
|
84
66
|
const productFilter = params.filters.find(x => x.name == 'product')
|
|
85
67
|
const createArrivalNotice = params.filters.find(x => x.name == 'create_arrival_notice')
|
|
86
|
-
const productInfoFilterColumns = ['sku', 'name', 'description', 'type', 'brand']
|
|
68
|
+
const productInfoFilterColumns = ['sku', 'name', 'description', 'type', 'brand', 'brandSku']
|
|
87
69
|
params.filters = params.filters.filter(
|
|
88
70
|
x =>
|
|
89
71
|
x.name != 'product_info' &&
|
|
@@ -94,6 +76,7 @@ export class ProductDetailQuery {
|
|
|
94
76
|
x.name != 'name' &&
|
|
95
77
|
x.name != 'description' &&
|
|
96
78
|
x.name != 'type' &&
|
|
79
|
+
x.name != 'brandSku' &&
|
|
97
80
|
x.name != 'create_arrival_notice'
|
|
98
81
|
)
|
|
99
82
|
|
|
@@ -187,6 +170,7 @@ export class ProductDetailQuery {
|
|
|
187
170
|
type: item.product.type,
|
|
188
171
|
sku: item.product.sku,
|
|
189
172
|
brand: item.product.brand,
|
|
173
|
+
brandSku: item.product.brandSku,
|
|
190
174
|
isRequireSerialNumberScanningInbound: item.product.isRequireSerialNumberScanningInbound,
|
|
191
175
|
isRequireSerialNumberScanningOutbound: item.product.isRequireSerialNumberScanningOutbound,
|
|
192
176
|
costPrice: item?.costPrice || item?.costPrice == 0 ? parseFloat(item.costPrice.toFixed(2)) : null
|