@things-factory/warehouse-base 4.3.127 → 4.3.129
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.
|
@@ -24,7 +24,10 @@ const tote_types_1 = require("./tote-types");
|
|
|
24
24
|
let ToteQuery = class ToteQuery {
|
|
25
25
|
async totes(context, filters, pagination, sortings) {
|
|
26
26
|
const { domain } = context.state;
|
|
27
|
-
const
|
|
27
|
+
const nameFilter = filters.find((filter) => filter.name === 'name');
|
|
28
|
+
const bizplaceFilter = filters.find((filter) => filter.name === 'bizplace');
|
|
29
|
+
const statusFilter = filters.find((filter) => filter.name === 'status');
|
|
30
|
+
const deletedFilter = filters.find((filter) => filter.name === 'deleted' && filter.value == true);
|
|
28
31
|
const queryBuilder = (0, typeorm_1.getRepository)(tote_1.Tote).createQueryBuilder();
|
|
29
32
|
(0, shell_1.buildQuery)(queryBuilder, { filters, pagination, sortings }, context);
|
|
30
33
|
queryBuilder
|
|
@@ -33,6 +36,15 @@ let ToteQuery = class ToteQuery {
|
|
|
33
36
|
.leftJoinAndSelect('Tote.creator', 'Creator')
|
|
34
37
|
.leftJoinAndSelect('Tote.updater', 'Updater')
|
|
35
38
|
.where('Domain.id = :domainId', { domainId: domain.id });
|
|
39
|
+
if (nameFilter) {
|
|
40
|
+
queryBuilder.andWhere('Tote.name ilike :name', { name: nameFilter.value });
|
|
41
|
+
}
|
|
42
|
+
if (statusFilter) {
|
|
43
|
+
queryBuilder.andWhere('Tote.status = :status', { status: statusFilter.value });
|
|
44
|
+
}
|
|
45
|
+
if (bizplaceFilter) {
|
|
46
|
+
queryBuilder.andWhere('Tote.bizplace_id = :id', { id: bizplaceFilter.value });
|
|
47
|
+
}
|
|
36
48
|
if (deletedFilter) {
|
|
37
49
|
queryBuilder.andWhere('Tote.deletedAt IS NOT NULL');
|
|
38
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tote-query.js","sourceRoot":"","sources":["../../../server/service/tote/tote-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6E;AAC7E,qCAA+C;AAE/C,yDAAgD;AAChD,uDAAmD;AACnD,iDAAuF;AAEvF,iCAA6B;AAC7B,6CAAuC;AAGhC,IAAM,SAAS,GAAf,MAAM,SAAS;IAEd,AAAN,KAAK,CAAC,KAAK,CACF,OAAY,EACmC,OAAkB,EACb,UAAuB,EAC1B,QAAoB;QAE5E,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,MAAM,aAAa,GAAQ,OAAO,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"tote-query.js","sourceRoot":"","sources":["../../../server/service/tote/tote-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/warehouse-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.129",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -31,5 +31,5 @@
|
|
|
31
31
|
"@things-factory/product-base": "^4.3.122",
|
|
32
32
|
"@things-factory/setting-base": "^4.3.122"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "e34b57b1a0974f4bcc4ef92e63e2327b800613b3"
|
|
35
35
|
}
|
|
@@ -19,7 +19,10 @@ export class ToteQuery {
|
|
|
19
19
|
): Promise<ToteList> {
|
|
20
20
|
const { domain }: { domain: Domain } = context.state
|
|
21
21
|
|
|
22
|
-
const
|
|
22
|
+
const nameFilter: any = filters.find((filter: any) => filter.name === 'name')
|
|
23
|
+
const bizplaceFilter: any = filters.find((filter: any) => filter.name === 'bizplace')
|
|
24
|
+
const statusFilter: any = filters.find((filter: any) => filter.name === 'status')
|
|
25
|
+
const deletedFilter: any = filters.find((filter: any) => filter.name === 'deleted' && filter.value == true)
|
|
23
26
|
|
|
24
27
|
const queryBuilder = getRepository(Tote).createQueryBuilder()
|
|
25
28
|
buildQuery(queryBuilder, { filters, pagination, sortings }, context)
|
|
@@ -31,6 +34,18 @@ export class ToteQuery {
|
|
|
31
34
|
.leftJoinAndSelect('Tote.updater', 'Updater')
|
|
32
35
|
.where('Domain.id = :domainId', { domainId: domain.id })
|
|
33
36
|
|
|
37
|
+
if (nameFilter) {
|
|
38
|
+
queryBuilder.andWhere('Tote.name ilike :name', { name: nameFilter.value })
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (statusFilter) {
|
|
42
|
+
queryBuilder.andWhere('Tote.status = :status', { status: statusFilter.value })
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (bizplaceFilter) {
|
|
46
|
+
queryBuilder.andWhere('Tote.bizplace_id = :id', { id: bizplaceFilter.value })
|
|
47
|
+
}
|
|
48
|
+
|
|
34
49
|
if (deletedFilter) {
|
|
35
50
|
queryBuilder.andWhere('Tote.deletedAt IS NOT NULL')
|
|
36
51
|
} else {
|