@things-factory/warehouse-base 3.8.2 → 3.8.3
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 +24 -22
- package/dist-server/service/location/location-query.js.map +1 -1
- package/dist-server/service/location/location-types.js +8 -3
- package/dist-server/service/location/location-types.js.map +1 -1
- package/package.json +5 -5
- package/server/service/location/location-query.ts +46 -43
- package/server/service/location/location-types.ts +4 -0
|
@@ -95,15 +95,15 @@ let LocationQuery = class LocationQuery {
|
|
|
95
95
|
return { items, total };
|
|
96
96
|
}
|
|
97
97
|
async locationWithInventories(params, context) {
|
|
98
|
-
var _a;
|
|
98
|
+
var _a, _b;
|
|
99
99
|
const { domain, user } = context.state;
|
|
100
100
|
const bizplaceIds = await (0, biz_base_1.getPermittedBizplaceIds)(domain, user);
|
|
101
101
|
const queryBuilder = (0, typeorm_1.getRepository)(location_1.Location).createQueryBuilder();
|
|
102
|
-
const
|
|
102
|
+
const warehouseNames = (_a = params.filters.find(x => x.name === 'warehouseNames' && x.operator.toLowerCase() === 'in')) === null || _a === void 0 ? void 0 : _a.value;
|
|
103
|
+
const locationTypes = (_b = params.filters.find(x => x.name === 'locationTypes' && x.operator.toLowerCase() === 'in')) === null || _b === void 0 ? void 0 : _b.value;
|
|
103
104
|
params.filters = [];
|
|
104
105
|
(0, shell_1.buildQuery)(queryBuilder, params, context);
|
|
105
106
|
queryBuilder
|
|
106
|
-
.innerJoinAndSelect('Location.domain', 'Domain')
|
|
107
107
|
.leftJoinAndSelect('Location.warehouse', 'Warehouse')
|
|
108
108
|
.leftJoinAndSelect('inventories', 'Inventory', 'Location.id = Inventory.location_id AND Inventory.status = :InvStatus', {
|
|
109
109
|
InvStatus: inventory_1.INVENTORY_STATUS.STORED
|
|
@@ -113,14 +113,20 @@ let LocationQuery = class LocationQuery {
|
|
|
113
113
|
bizplaceIds: [...new Set(bizplaceIds)]
|
|
114
114
|
})
|
|
115
115
|
.leftJoinAndSelect('Inventory.creator', 'Creator')
|
|
116
|
-
.leftJoinAndSelect('Inventory.updater', 'Updater')
|
|
117
|
-
|
|
118
|
-
|
|
116
|
+
.leftJoinAndSelect('Inventory.updater', 'Updater')
|
|
117
|
+
.addSelect('SUM("Inventory"."qty") OVER(PARTITION BY "Location"."id")', 'accumulate_qty')
|
|
118
|
+
.where('Location.domain_id = :domainId', { domainId: domain.id });
|
|
119
|
+
if (warehouseNames) {
|
|
120
|
+
queryBuilder.andWhere('Warehouse.name IN (:...warehouseNames)', { warehouseNames: [...new Set(warehouseNames)] });
|
|
121
|
+
}
|
|
122
|
+
if (locationTypes) {
|
|
123
|
+
queryBuilder.andWhere('Location.type ILIKE ANY (ARRAY[:...locationTypes])', {
|
|
124
|
+
locationTypes: [...new Set(locationTypes)]
|
|
125
|
+
});
|
|
119
126
|
}
|
|
120
127
|
let items = await queryBuilder.getRawMany();
|
|
121
128
|
const total = await queryBuilder.getCount();
|
|
122
|
-
items = items
|
|
123
|
-
.map(item => {
|
|
129
|
+
items = items.map(item => {
|
|
124
130
|
return {
|
|
125
131
|
id: item.Location_id,
|
|
126
132
|
name: item.Location_name,
|
|
@@ -136,26 +142,22 @@ let LocationQuery = class LocationQuery {
|
|
|
136
142
|
palletId: item.Inventory_pallet_id || '',
|
|
137
143
|
batchId: item.Inventory_batch_id || '',
|
|
138
144
|
qty: item.Inventory_qty || 0,
|
|
145
|
+
accumulatedQty: item.accumulate_qty || 0,
|
|
139
146
|
uomValue: item.Inventory_uom_value || 0.0,
|
|
140
147
|
uom: item.Inventory_uom || '',
|
|
141
148
|
packingType: item.Inventory_packing_type || '',
|
|
142
149
|
packingSize: item.Inventory_packing_size || 0.0,
|
|
143
|
-
expirationDate: item.Inventory_expiration_date
|
|
144
|
-
|
|
150
|
+
expirationDate: item.Inventory_expiration_date
|
|
151
|
+
? new Date(item.Inventory_expiration_date).toISOString().split('T')[0].split('-').reverse().join('-')
|
|
152
|
+
: '',
|
|
153
|
+
warehouse: {
|
|
154
|
+
name: item.Warehouse_name,
|
|
155
|
+
description: item.Warehouse_description,
|
|
156
|
+
type: item.Warehouse_type
|
|
157
|
+
},
|
|
145
158
|
zone: item.Location_zone
|
|
146
159
|
};
|
|
147
|
-
})
|
|
148
|
-
.reduce((acc, curr) => {
|
|
149
|
-
acc.push(curr);
|
|
150
|
-
const accQty = curr.palletId !== '' ? acc.filter(x => x.id === curr.id).reduce((x, y) => (x += y.qty), 0) : 0;
|
|
151
|
-
acc = acc.map(x => {
|
|
152
|
-
if (x.id === curr.id)
|
|
153
|
-
return Object.assign(Object.assign({}, x), { accumulatedQty: accQty });
|
|
154
|
-
else
|
|
155
|
-
return Object.assign({}, x);
|
|
156
|
-
});
|
|
157
|
-
return acc;
|
|
158
|
-
}, []);
|
|
160
|
+
});
|
|
159
161
|
return { items, total };
|
|
160
162
|
}
|
|
161
163
|
async domain(location) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"location-query.js","sourceRoot":"","sources":["../../../server/service/location/location-query.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"location-query.js","sourceRoot":"","sources":["../../../server/service/location/location-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,11 +8,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var _a, _b, _c;
|
|
11
|
+
var _a, _b, _c, _d;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.NewLocation = exports.LocationPatch = exports.LocationOccupancy = exports.LocationList = exports.LocationInventories = exports.LocationInventory = void 0;
|
|
14
14
|
const type_graphql_1 = require("type-graphql");
|
|
15
15
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
16
|
+
const product_base_1 = require("@things-factory/product-base");
|
|
16
17
|
const shell_1 = require("@things-factory/shell");
|
|
17
18
|
const warehouse_1 = require("../warehouse/warehouse");
|
|
18
19
|
const location_1 = require("./location");
|
|
@@ -70,6 +71,10 @@ __decorate([
|
|
|
70
71
|
(0, type_graphql_1.Field)(type => warehouse_1.Warehouse, { nullable: true }),
|
|
71
72
|
__metadata("design:type", warehouse_1.Warehouse)
|
|
72
73
|
], LocationInventory.prototype, "warehouse", void 0);
|
|
74
|
+
__decorate([
|
|
75
|
+
(0, type_graphql_1.Field)(type => product_base_1.Product, { nullable: true }),
|
|
76
|
+
__metadata("design:type", typeof (_b = typeof product_base_1.Product !== "undefined" && product_base_1.Product) === "function" ? _b : Object)
|
|
77
|
+
], LocationInventory.prototype, "product", void 0);
|
|
73
78
|
__decorate([
|
|
74
79
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
75
80
|
__metadata("design:type", String)
|
|
@@ -136,7 +141,7 @@ __decorate([
|
|
|
136
141
|
], LocationPatch.prototype, "id", void 0);
|
|
137
142
|
__decorate([
|
|
138
143
|
(0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
|
|
139
|
-
__metadata("design:type", typeof (
|
|
144
|
+
__metadata("design:type", typeof (_c = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _c : Object)
|
|
140
145
|
], LocationPatch.prototype, "warehouse", void 0);
|
|
141
146
|
__decorate([
|
|
142
147
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
@@ -194,7 +199,7 @@ let NewLocation = class NewLocation {
|
|
|
194
199
|
};
|
|
195
200
|
__decorate([
|
|
196
201
|
(0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
|
|
197
|
-
__metadata("design:type", typeof (
|
|
202
|
+
__metadata("design:type", typeof (_d = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _d : Object)
|
|
198
203
|
], NewLocation.prototype, "warehouse", void 0);
|
|
199
204
|
__decorate([
|
|
200
205
|
(0, type_graphql_1.Field)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"location-types.js","sourceRoot":"","sources":["../../../server/service/location/location-types.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAuE;AAEvE,uDAAmD;AACnD,iDAAiD;AAEjD,sDAAkD;AAClD,yCAAqC;AAGrC,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"location-types.js","sourceRoot":"","sources":["../../../server/service/location/location-types.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": "3.8.
|
|
3
|
+
"version": "3.8.3",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@things-factory/biz-base": "^3.8.0",
|
|
28
28
|
"@things-factory/id-rule-base": "^3.8.0",
|
|
29
|
-
"@things-factory/integration-sellercraft": "^3.8.
|
|
30
|
-
"@things-factory/marketplace-base": "^3.8.
|
|
31
|
-
"@things-factory/product-base": "^3.8.
|
|
29
|
+
"@things-factory/integration-sellercraft": "^3.8.3",
|
|
30
|
+
"@things-factory/marketplace-base": "^3.8.3",
|
|
31
|
+
"@things-factory/product-base": "^3.8.3",
|
|
32
32
|
"@things-factory/setting-base": "^3.8.0"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "b1c118ec9834b1cb4ccf9e85b70623250a8f6745"
|
|
35
35
|
}
|
|
@@ -118,14 +118,16 @@ export class LocationQuery {
|
|
|
118
118
|
const bizplaceIds = await getPermittedBizplaceIds(domain, user)
|
|
119
119
|
const queryBuilder = getRepository(Location).createQueryBuilder()
|
|
120
120
|
|
|
121
|
-
const
|
|
121
|
+
const warehouseNames = params.filters.find(x => x.name === 'warehouseNames' && x.operator.toLowerCase() === 'in')
|
|
122
|
+
?.value
|
|
123
|
+
|
|
124
|
+
const locationTypes = params.filters.find(x => x.name === 'locationTypes' && x.operator.toLowerCase() === 'in')
|
|
122
125
|
?.value
|
|
123
126
|
|
|
124
127
|
params.filters = []
|
|
125
128
|
buildQuery(queryBuilder, params, context)
|
|
126
129
|
|
|
127
130
|
queryBuilder
|
|
128
|
-
.innerJoinAndSelect('Location.domain', 'Domain')
|
|
129
131
|
.leftJoinAndSelect('Location.warehouse', 'Warehouse')
|
|
130
132
|
.leftJoinAndSelect(
|
|
131
133
|
'inventories',
|
|
@@ -141,53 +143,54 @@ export class LocationQuery {
|
|
|
141
143
|
})
|
|
142
144
|
.leftJoinAndSelect('Inventory.creator', 'Creator')
|
|
143
145
|
.leftJoinAndSelect('Inventory.updater', 'Updater')
|
|
146
|
+
.addSelect('SUM("Inventory"."qty") OVER(PARTITION BY "Location"."id")', 'accumulate_qty')
|
|
147
|
+
.where('Location.domain_id = :domainId', { domainId: domain.id })
|
|
144
148
|
|
|
145
|
-
if (
|
|
146
|
-
queryBuilder.andWhere('Warehouse.name
|
|
149
|
+
if (warehouseNames) {
|
|
150
|
+
queryBuilder.andWhere('Warehouse.name IN (:...warehouseNames)', { warehouseNames: [...new Set(warehouseNames)] })
|
|
147
151
|
}
|
|
148
152
|
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
items = items
|
|
153
|
-
.map(item => {
|
|
154
|
-
return {
|
|
155
|
-
id: item.Location_id,
|
|
156
|
-
name: item.Location_name,
|
|
157
|
-
bizplace: {
|
|
158
|
-
name: item.Bizplace_name || '',
|
|
159
|
-
description: item.Bizplace_description || ''
|
|
160
|
-
},
|
|
161
|
-
product: {
|
|
162
|
-
name: item.Product_name || '',
|
|
163
|
-
sku: item.Product_sku || '',
|
|
164
|
-
description: item.Product_description || ''
|
|
165
|
-
},
|
|
166
|
-
palletId: item.Inventory_pallet_id || '',
|
|
167
|
-
batchId: item.Inventory_batch_id || '',
|
|
168
|
-
qty: item.Inventory_qty || 0,
|
|
169
|
-
uomValue: item.Inventory_uom_value || 0.0,
|
|
170
|
-
uom: item.Inventory_uom || '',
|
|
171
|
-
packingType: item.Inventory_packing_type || '',
|
|
172
|
-
packingSize: item.Inventory_packing_size || 0.0,
|
|
173
|
-
expirationDate: item.Inventory_expiration_date || '',
|
|
174
|
-
warehouse: item.Warehouse_name,
|
|
175
|
-
zone: item.Location_zone
|
|
176
|
-
}
|
|
153
|
+
if (locationTypes) {
|
|
154
|
+
queryBuilder.andWhere('Location.type ILIKE ANY (ARRAY[:...locationTypes])', {
|
|
155
|
+
locationTypes: [...new Set(locationTypes)]
|
|
177
156
|
})
|
|
178
|
-
|
|
179
|
-
acc.push(curr)
|
|
180
|
-
|
|
181
|
-
const accQty: number =
|
|
182
|
-
curr.palletId !== '' ? acc.filter(x => x.id === curr.id).reduce((x, y) => (x += y.qty), 0) : 0
|
|
157
|
+
}
|
|
183
158
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
else return { ...x }
|
|
187
|
-
})
|
|
159
|
+
let items = await queryBuilder.getRawMany()
|
|
160
|
+
const total = await queryBuilder.getCount()
|
|
188
161
|
|
|
189
|
-
|
|
190
|
-
|
|
162
|
+
items = items.map(item => {
|
|
163
|
+
return {
|
|
164
|
+
id: item.Location_id,
|
|
165
|
+
name: item.Location_name,
|
|
166
|
+
bizplace: {
|
|
167
|
+
name: item.Bizplace_name || '',
|
|
168
|
+
description: item.Bizplace_description || ''
|
|
169
|
+
},
|
|
170
|
+
product: {
|
|
171
|
+
name: item.Product_name || '',
|
|
172
|
+
sku: item.Product_sku || '',
|
|
173
|
+
description: item.Product_description || ''
|
|
174
|
+
},
|
|
175
|
+
palletId: item.Inventory_pallet_id || '',
|
|
176
|
+
batchId: item.Inventory_batch_id || '',
|
|
177
|
+
qty: item.Inventory_qty || 0,
|
|
178
|
+
accumulatedQty: item.accumulate_qty || 0,
|
|
179
|
+
uomValue: item.Inventory_uom_value || 0.0,
|
|
180
|
+
uom: item.Inventory_uom || '',
|
|
181
|
+
packingType: item.Inventory_packing_type || '',
|
|
182
|
+
packingSize: item.Inventory_packing_size || 0.0,
|
|
183
|
+
expirationDate: item.Inventory_expiration_date
|
|
184
|
+
? new Date(item.Inventory_expiration_date).toISOString().split('T')[0].split('-').reverse().join('-')
|
|
185
|
+
: '',
|
|
186
|
+
warehouse: {
|
|
187
|
+
name: item.Warehouse_name,
|
|
188
|
+
description: item.Warehouse_description,
|
|
189
|
+
type: item.Warehouse_type
|
|
190
|
+
},
|
|
191
|
+
zone: item.Location_zone
|
|
192
|
+
}
|
|
193
|
+
})
|
|
191
194
|
|
|
192
195
|
return { items, total }
|
|
193
196
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
|
|
2
2
|
|
|
3
3
|
import { Bizplace } from '@things-factory/biz-base'
|
|
4
|
+
import { Product } from '@things-factory/product-base'
|
|
4
5
|
import { ObjectRef } from '@things-factory/shell'
|
|
5
6
|
|
|
6
7
|
import { Warehouse } from '../warehouse/warehouse'
|
|
@@ -47,6 +48,9 @@ export class LocationInventory {
|
|
|
47
48
|
@Field(type => Warehouse, { nullable: true })
|
|
48
49
|
warehouse?: Warehouse
|
|
49
50
|
|
|
51
|
+
@Field(type => Product, { nullable: true })
|
|
52
|
+
product?: Product
|
|
53
|
+
|
|
50
54
|
@Field({ nullable: true })
|
|
51
55
|
zone?: string
|
|
52
56
|
}
|