@things-factory/warehouse-base 4.3.126 → 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.
- package/dist-server/service/location/location-query.js +0 -43
- package/dist-server/service/location/location-query.js.map +1 -1
- package/dist-server/service/tote/tote-query.js +13 -1
- package/dist-server/service/tote/tote-query.js.map +1 -1
- package/package.json +2 -2
- package/server/service/location/location-query.ts +6 -24
- package/server/service/tote/tote-query.ts +16 -1
|
@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.LocationQuery = void 0;
|
|
17
17
|
const type_graphql_1 = require("type-graphql");
|
|
18
18
|
const typeorm_1 = require("typeorm");
|
|
19
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
|
20
19
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
21
20
|
const shell_1 = require("@things-factory/shell");
|
|
22
21
|
const inventory_1 = require("../../constants/inventory");
|
|
@@ -168,20 +167,6 @@ let LocationQuery = class LocationQuery {
|
|
|
168
167
|
});
|
|
169
168
|
return { items, total };
|
|
170
169
|
}
|
|
171
|
-
async domain(location) {
|
|
172
|
-
var _a;
|
|
173
|
-
return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne((_a = location.domain) === null || _a === void 0 ? void 0 : _a.id);
|
|
174
|
-
}
|
|
175
|
-
async updater(location) {
|
|
176
|
-
return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(location.updaterId);
|
|
177
|
-
}
|
|
178
|
-
async creator(location) {
|
|
179
|
-
return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(location.creatorId);
|
|
180
|
-
}
|
|
181
|
-
async warehouse(location) {
|
|
182
|
-
var _a;
|
|
183
|
-
return await (0, typeorm_1.getRepository)(warehouse_1.Warehouse).findOne((_a = location.warehouse) === null || _a === void 0 ? void 0 : _a.id);
|
|
184
|
-
}
|
|
185
170
|
};
|
|
186
171
|
__decorate([
|
|
187
172
|
(0, type_graphql_1.Directive)('@privilege(category: "warehouse", privilege: "query")'),
|
|
@@ -247,34 +232,6 @@ __decorate([
|
|
|
247
232
|
__metadata("design:paramtypes", [typeof (_d = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _d : Object, Object]),
|
|
248
233
|
__metadata("design:returntype", Promise)
|
|
249
234
|
], LocationQuery.prototype, "locationWithInventories", null);
|
|
250
|
-
__decorate([
|
|
251
|
-
(0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
|
|
252
|
-
__param(0, (0, type_graphql_1.Root)()),
|
|
253
|
-
__metadata("design:type", Function),
|
|
254
|
-
__metadata("design:paramtypes", [location_1.Location]),
|
|
255
|
-
__metadata("design:returntype", Promise)
|
|
256
|
-
], LocationQuery.prototype, "domain", null);
|
|
257
|
-
__decorate([
|
|
258
|
-
(0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
|
|
259
|
-
__param(0, (0, type_graphql_1.Root)()),
|
|
260
|
-
__metadata("design:type", Function),
|
|
261
|
-
__metadata("design:paramtypes", [location_1.Location]),
|
|
262
|
-
__metadata("design:returntype", Promise)
|
|
263
|
-
], LocationQuery.prototype, "updater", null);
|
|
264
|
-
__decorate([
|
|
265
|
-
(0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
|
|
266
|
-
__param(0, (0, type_graphql_1.Root)()),
|
|
267
|
-
__metadata("design:type", Function),
|
|
268
|
-
__metadata("design:paramtypes", [location_1.Location]),
|
|
269
|
-
__metadata("design:returntype", Promise)
|
|
270
|
-
], LocationQuery.prototype, "creator", null);
|
|
271
|
-
__decorate([
|
|
272
|
-
(0, type_graphql_1.FieldResolver)(type => warehouse_1.Warehouse),
|
|
273
|
-
__param(0, (0, type_graphql_1.Root)()),
|
|
274
|
-
__metadata("design:type", Function),
|
|
275
|
-
__metadata("design:paramtypes", [location_1.Location]),
|
|
276
|
-
__metadata("design:returntype", Promise)
|
|
277
|
-
], LocationQuery.prototype, "warehouse", null);
|
|
278
235
|
LocationQuery = __decorate([
|
|
279
236
|
(0, type_graphql_1.Resolver)(location_1.Location)
|
|
280
237
|
], LocationQuery);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"location-query.js","sourceRoot":"","sources":["../../../server/service/location/location-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;
|
|
1
|
+
{"version":3,"file":"location-query.js","sourceRoot":"","sources":["../../../server/service/location/location-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
}
|
|
@@ -130,11 +130,13 @@ export class LocationQuery {
|
|
|
130
130
|
const bizplaceIds = await getPermittedBizplaceIds(domain, user)
|
|
131
131
|
const queryBuilder = getRepository(Location).createQueryBuilder()
|
|
132
132
|
|
|
133
|
-
const warehouseNames = params.filters.find(
|
|
134
|
-
|
|
133
|
+
const warehouseNames = params.filters.find(
|
|
134
|
+
x => x.name === 'warehouseNames' && x.operator.toLowerCase() === 'in'
|
|
135
|
+
)?.value
|
|
135
136
|
|
|
136
|
-
const locationTypes = params.filters.find(
|
|
137
|
-
|
|
137
|
+
const locationTypes = params.filters.find(
|
|
138
|
+
x => x.name === 'locationTypes' && x.operator.toLowerCase() === 'in'
|
|
139
|
+
)?.value
|
|
138
140
|
|
|
139
141
|
params.filters = []
|
|
140
142
|
buildQuery(queryBuilder, params, context)
|
|
@@ -206,24 +208,4 @@ export class LocationQuery {
|
|
|
206
208
|
|
|
207
209
|
return { items, total }
|
|
208
210
|
}
|
|
209
|
-
|
|
210
|
-
@FieldResolver(type => Domain)
|
|
211
|
-
async domain(@Root() location: Location) {
|
|
212
|
-
return await getRepository(Domain).findOne(location.domain?.id)
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
@FieldResolver(type => User)
|
|
216
|
-
async updater(@Root() location: Location) {
|
|
217
|
-
return await getRepository(User).findOne(location.updaterId)
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
@FieldResolver(type => User)
|
|
221
|
-
async creator(@Root() location: Location) {
|
|
222
|
-
return await getRepository(User).findOne(location.creatorId)
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
@FieldResolver(type => Warehouse)
|
|
226
|
-
async warehouse(@Root() location: Location): Promise<Warehouse> {
|
|
227
|
-
return await getRepository(Warehouse).findOne(location.warehouse?.id)
|
|
228
|
-
}
|
|
229
211
|
}
|
|
@@ -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 {
|