@rytass/wms-module-core 0.4.0 → 0.6.0
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/README.md +69 -7
- package/docs/api-reference.md +58 -10
- package/docs/custom-entities.md +105 -68
- package/index.cjs.js +1263 -151
- package/index.js +10 -0
- package/lib/constants/index.d.ts +2 -0
- package/lib/constants/inventory-count-status.d.ts +19 -0
- package/lib/constants/inventory-count-status.js +22 -0
- package/lib/constants/operations.d.ts +34 -0
- package/lib/constants/operations.js +66 -0
- package/lib/constants/stock-status.d.ts +2 -0
- package/lib/constants/stock-status.js +4 -0
- package/lib/core.module.js +91 -30
- package/lib/events/index.d.ts +1 -0
- package/lib/events/inventory-count-lock.subscriber.d.ts +38 -0
- package/lib/events/inventory-count-lock.subscriber.js +98 -0
- package/lib/events/stock-change.subscriber.js +6 -0
- package/lib/events/wms-event.types.d.ts +2 -2
- package/lib/models/extensions/allocate-inventory-order/allocate-inventory-order-item.entity.js +1 -0
- package/lib/models/extensions/hold-inventory-order/hold-inventory-order-item.entity.js +1 -0
- package/lib/models/extensions/index.d.ts +3 -0
- package/lib/models/extensions/inventory-count-order/inventory-count-order-change.entity.d.ts +20 -0
- package/lib/models/extensions/inventory-count-order/inventory-count-order-change.entity.js +50 -0
- package/lib/models/extensions/inventory-count-order/inventory-count-order-item.entity.d.ts +39 -0
- package/lib/models/extensions/inventory-count-order/inventory-count-order-item.entity.js +123 -0
- package/lib/models/extensions/inventory-count-order/inventory-count-order.entity.d.ts +50 -0
- package/lib/models/extensions/inventory-count-order/inventory-count-order.entity.js +155 -0
- package/lib/models/extensions/merge-batch-order/merge-batch-order-item.entity.js +1 -0
- package/lib/models/extensions/quality-inspection-order/quality-inspection-order-item.entity.js +1 -0
- package/lib/models/extensions/reclassify-inventory-order/reclassify-inventory-order-item.entity.js +1 -0
- package/lib/models/extensions/scrape-order/scrape-order-item.entity.js +1 -0
- package/lib/models/extensions/split-batch-order/split-batch-order-item.entity.js +1 -0
- package/lib/models/extensions/transfer-customer-order/transfer-customer-order-item.entity.js +1 -0
- package/lib/models/extensions/transfer-order/transfer-order-item.entity.js +1 -0
- package/lib/models/extensions/transfer-vendor-order/transfer-vendor-order-item.entity.js +1 -0
- package/lib/models/index.d.ts +1 -0
- package/lib/models/metadata/index.d.ts +1 -0
- package/lib/models/metadata/order.entity.d.ts +9 -0
- package/lib/models/metadata/order.entity.js +5 -0
- package/lib/models/models.module.js +22 -8
- package/lib/models/wms-entities.d.ts +45 -0
- package/lib/models/wms-entities.js +82 -0
- package/lib/services/allocate-inventory-order.service.d.ts +3 -1
- package/lib/services/allocate-inventory-order.service.js +13 -6
- package/lib/services/batch.service.js +8 -3
- package/lib/services/hold-inventory-order.service.d.ts +3 -1
- package/lib/services/hold-inventory-order.service.js +13 -6
- package/lib/services/index.d.ts +1 -0
- package/lib/services/inventory-count-order.service.d.ts +143 -0
- package/lib/services/inventory-count-order.service.js +521 -0
- package/lib/services/loader.service.js +5 -0
- package/lib/services/location.service.js +5 -0
- package/lib/services/material.service.d.ts +1 -15
- package/lib/services/material.service.js +5 -20
- package/lib/services/merge-batch-order.service.d.ts +3 -1
- package/lib/services/merge-batch-order.service.js +16 -9
- package/lib/services/quality-inspection-order.service.d.ts +3 -1
- package/lib/services/quality-inspection-order.service.js +15 -8
- package/lib/services/receive-inventory-order.service.d.ts +3 -1
- package/lib/services/receive-inventory-order.service.js +18 -11
- package/lib/services/reclassify-inventory-order.service.d.ts +3 -1
- package/lib/services/reclassify-inventory-order.service.js +16 -9
- package/lib/services/scrape.service.d.ts +3 -1
- package/lib/services/scrape.service.js +12 -5
- package/lib/services/ship-inventory-order.service.d.ts +3 -1
- package/lib/services/ship-inventory-order.service.js +21 -14
- package/lib/services/split-batch-order.service.d.ts +3 -1
- package/lib/services/split-batch-order.service.js +16 -9
- package/lib/services/stock.service.d.ts +3 -1
- package/lib/services/stock.service.js +17 -10
- package/lib/services/transfer-customer-order.service.d.ts +3 -1
- package/lib/services/transfer-customer-order.service.js +15 -8
- package/lib/services/transfer-order.service.d.ts +3 -1
- package/lib/services/transfer-order.service.js +14 -7
- package/lib/services/transfer-vendor-order.service.d.ts +3 -1
- package/lib/services/transfer-vendor-order.service.js +15 -8
- package/lib/services/unit.service.js +5 -0
- package/lib/services/warehouse-map.service.d.ts +14 -2
- package/lib/services/warehouse-map.service.js +21 -9
- package/package.json +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param, __metadata } from 'tslib';
|
|
2
2
|
import { Injectable, Inject } from '@nestjs/common';
|
|
3
|
-
import
|
|
3
|
+
import '../models/metadata/batch.entity.js';
|
|
4
4
|
import '../models/metadata/batch-group.entity.js';
|
|
5
5
|
import '../models/metadata/loader.entity.js';
|
|
6
6
|
import '../models/metadata/loader-type.entity.js';
|
|
@@ -8,9 +8,11 @@ import '../models/metadata/loader-unit.entity.js';
|
|
|
8
8
|
import '../models/metadata/location.entity.js';
|
|
9
9
|
import '../models/metadata/material.entity.js';
|
|
10
10
|
import '../models/metadata/material-unit.entity.js';
|
|
11
|
+
import '@rytass/wms-base-nestjs-module';
|
|
11
12
|
import '../models/metadata/sale-order.entity.js';
|
|
12
|
-
import
|
|
13
|
+
import '../models/metadata/stock.entity.js';
|
|
13
14
|
import '../models/metadata/unit.entity.js';
|
|
15
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
14
16
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
15
17
|
import '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
16
18
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
@@ -48,8 +50,10 @@ import '../models/extensions/transfer-customer-order/transfer-customer-order-cha
|
|
|
48
50
|
import '../models/extensions/scrape-order/scrape-order.entity.js';
|
|
49
51
|
import '../models/extensions/scrape-order/scrape-order-item.entity.js';
|
|
50
52
|
import '../models/extensions/scrape-order/scrape-order-change.entity.js';
|
|
53
|
+
import '../models/extensions/inventory-count-order/inventory-count-order.entity.js';
|
|
54
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-item.entity.js';
|
|
55
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-change.entity.js';
|
|
51
56
|
import { DataSource } from 'typeorm';
|
|
52
|
-
import { OrderEntity } from '@rytass/wms-base-nestjs-module';
|
|
53
57
|
import { MaterialService } from './material.service.js';
|
|
54
58
|
import { BatchService } from './batch.service.js';
|
|
55
59
|
import { HelperService } from './helper.service.js';
|
|
@@ -57,6 +61,7 @@ import { StockService } from './stock.service.js';
|
|
|
57
61
|
|
|
58
62
|
let SplitBatchOrderService = class SplitBatchOrderService {
|
|
59
63
|
dataSource;
|
|
64
|
+
entities;
|
|
60
65
|
materialService;
|
|
61
66
|
batchService;
|
|
62
67
|
helperService;
|
|
@@ -64,8 +69,9 @@ let SplitBatchOrderService = class SplitBatchOrderService {
|
|
|
64
69
|
splitBatchOrderEntity;
|
|
65
70
|
splitBatchOrderItemEntity;
|
|
66
71
|
seqPrefix = 'SBO';
|
|
67
|
-
constructor(dataSource, materialService, batchService, helperService, stockService, splitBatchOrderEntity, splitBatchOrderItemEntity) {
|
|
72
|
+
constructor(dataSource, entities, materialService, batchService, helperService, stockService, splitBatchOrderEntity, splitBatchOrderItemEntity) {
|
|
68
73
|
this.dataSource = dataSource;
|
|
74
|
+
this.entities = entities;
|
|
69
75
|
this.materialService = materialService;
|
|
70
76
|
this.batchService = batchService;
|
|
71
77
|
this.helperService = helperService;
|
|
@@ -78,9 +84,9 @@ let SplitBatchOrderService = class SplitBatchOrderService {
|
|
|
78
84
|
const splitBatchOrderRepository = manager.getRepository(this.splitBatchOrderEntity);
|
|
79
85
|
const splitBatchOrderItemRepository = manager.getRepository(this.splitBatchOrderItemEntity);
|
|
80
86
|
const splitBatchOrderChangeRepository = manager.getRepository(SplitBatchOrderChangeEntityClass);
|
|
81
|
-
const orderRepository = manager.getRepository(
|
|
82
|
-
const stockRepository = manager.getRepository(
|
|
83
|
-
const batchRepository = manager.getRepository(
|
|
87
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
88
|
+
const stockRepository = manager.getRepository(this.entities.stock);
|
|
89
|
+
const batchRepository = manager.getRepository(this.entities.batch);
|
|
84
90
|
// Get original batch information
|
|
85
91
|
const originalBatch = await batchRepository.findOneOrFail({
|
|
86
92
|
where: { id: options.batchId },
|
|
@@ -149,9 +155,10 @@ let SplitBatchOrderService = class SplitBatchOrderService {
|
|
|
149
155
|
};
|
|
150
156
|
SplitBatchOrderService = __decorate([
|
|
151
157
|
Injectable(),
|
|
152
|
-
__param(
|
|
153
|
-
__param(
|
|
158
|
+
__param(6, Inject(SplitBatchOrderEntity)),
|
|
159
|
+
__param(7, Inject(SplitBatchOrderItemEntity)),
|
|
154
160
|
__metadata("design:paramtypes", [DataSource,
|
|
161
|
+
WmsEntities,
|
|
155
162
|
MaterialService,
|
|
156
163
|
BatchService,
|
|
157
164
|
HelperService,
|
|
@@ -6,8 +6,10 @@ import { MaterialEntityClass } from '../models/metadata/material.entity';
|
|
|
6
6
|
import { StockStatus } from '../constants/stock-status';
|
|
7
7
|
import { AggregatedStock, ChangeLog, ValidateStockDeductionParams } from '../typings/aggregated-stock';
|
|
8
8
|
import type { WmsModuleCoreModuleOptions } from '../typings/core-module-options';
|
|
9
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
9
10
|
export declare class StockService<T extends StockEntityClass = StockEntityClass, K extends MaterialEntityClass = MaterialEntityClass> implements OnModuleInit {
|
|
10
11
|
private readonly dataSource;
|
|
12
|
+
private readonly entities;
|
|
11
13
|
private readonly stockEntity;
|
|
12
14
|
private readonly materialEntity;
|
|
13
15
|
private readonly coreOptions;
|
|
@@ -24,7 +26,7 @@ export declare class StockService<T extends StockEntityClass = StockEntityClass,
|
|
|
24
26
|
loaderId: string;
|
|
25
27
|
status: StockStatus;
|
|
26
28
|
};
|
|
27
|
-
constructor(dataSource: DataSource, stockEntity: EntityTarget<T>, materialEntity: new () => K, coreOptions: WmsModuleCoreModuleOptions);
|
|
29
|
+
constructor(dataSource: DataSource, entities: WmsEntities, stockEntity: EntityTarget<T>, materialEntity: new () => K, coreOptions: WmsModuleCoreModuleOptions);
|
|
28
30
|
onModuleInit(): Promise<void>;
|
|
29
31
|
resolveLoaderId(loaderId: string | null | undefined): string;
|
|
30
32
|
resolveLocationId(locationId: string | null | undefined): string;
|
|
@@ -4,16 +4,17 @@ import { StockEntity } from '../models/metadata/stock.entity.js';
|
|
|
4
4
|
import { DataSource } from 'typeorm';
|
|
5
5
|
import { MaterialEntity } from '../models/metadata/material.entity.js';
|
|
6
6
|
import { StockStatus, ChangeType } from '../constants/stock-status.js';
|
|
7
|
-
import { BatchEntity } from '@rytass/wms-base-nestjs-module';
|
|
8
7
|
import '../models/metadata/batch.entity.js';
|
|
9
8
|
import '../models/metadata/batch-group.entity.js';
|
|
10
9
|
import { LoadersEntityClass } from '../models/metadata/loader.entity.js';
|
|
11
10
|
import { LoaderTypeEntityClass } from '../models/metadata/loader-type.entity.js';
|
|
12
11
|
import '../models/metadata/loader-unit.entity.js';
|
|
13
|
-
import
|
|
12
|
+
import '../models/metadata/location.entity.js';
|
|
14
13
|
import '../models/metadata/material-unit.entity.js';
|
|
14
|
+
import '@rytass/wms-base-nestjs-module';
|
|
15
15
|
import '../models/metadata/sale-order.entity.js';
|
|
16
16
|
import '../models/metadata/unit.entity.js';
|
|
17
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
17
18
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
18
19
|
import '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
19
20
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
@@ -51,10 +52,14 @@ import '../models/extensions/transfer-customer-order/transfer-customer-order-cha
|
|
|
51
52
|
import '../models/extensions/scrape-order/scrape-order.entity.js';
|
|
52
53
|
import '../models/extensions/scrape-order/scrape-order-item.entity.js';
|
|
53
54
|
import '../models/extensions/scrape-order/scrape-order-change.entity.js';
|
|
55
|
+
import '../models/extensions/inventory-count-order/inventory-count-order.entity.js';
|
|
56
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-item.entity.js';
|
|
57
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-change.entity.js';
|
|
54
58
|
import { WMS_CORE_MODULE_OPTIONS } from '../typings/core-module-options.js';
|
|
55
59
|
|
|
56
60
|
let StockService = class StockService {
|
|
57
61
|
dataSource;
|
|
62
|
+
entities;
|
|
58
63
|
stockEntity;
|
|
59
64
|
materialEntity;
|
|
60
65
|
coreOptions;
|
|
@@ -76,8 +81,9 @@ let StockService = class StockService {
|
|
|
76
81
|
status: status,
|
|
77
82
|
};
|
|
78
83
|
};
|
|
79
|
-
constructor(dataSource, stockEntity, materialEntity, coreOptions) {
|
|
84
|
+
constructor(dataSource, entities, stockEntity, materialEntity, coreOptions) {
|
|
80
85
|
this.dataSource = dataSource;
|
|
86
|
+
this.entities = entities;
|
|
81
87
|
this.stockEntity = stockEntity;
|
|
82
88
|
this.materialEntity = materialEntity;
|
|
83
89
|
this.coreOptions = coreOptions;
|
|
@@ -117,7 +123,7 @@ let StockService = class StockService {
|
|
|
117
123
|
}
|
|
118
124
|
async onModuleInit() {
|
|
119
125
|
const loaderTypeRepo = this.dataSource.getRepository(LoaderTypeEntityClass);
|
|
120
|
-
const locationRepo = this.dataSource.getRepository(
|
|
126
|
+
const locationRepo = this.dataSource.getRepository(this.entities.location);
|
|
121
127
|
const loaderRepo = this.dataSource.getRepository(LoadersEntityClass);
|
|
122
128
|
// Ensure default loader type exists
|
|
123
129
|
let loaderType = await loaderTypeRepo.findOneBy({
|
|
@@ -246,11 +252,11 @@ let StockService = class StockService {
|
|
|
246
252
|
materialKey: `%${options.materialKey}%`,
|
|
247
253
|
});
|
|
248
254
|
if (options.batchKey)
|
|
249
|
-
queryBuilder.innerJoin(
|
|
255
|
+
queryBuilder.innerJoin(this.entities.batch, 'bk', 'bk.id = stock."batchId" AND bk.key ILIKE :batchKey', {
|
|
250
256
|
batchKey: `%${options.batchKey}%`,
|
|
251
257
|
});
|
|
252
258
|
if (options.locationKey)
|
|
253
|
-
queryBuilder.innerJoin(
|
|
259
|
+
queryBuilder.innerJoin(this.entities.location, 'lk', 'lk.id = stock."locationId" AND lk.key ILIKE :locationKey', {
|
|
254
260
|
locationKey: `%${options.locationKey}%`,
|
|
255
261
|
});
|
|
256
262
|
if (options.loaderKey)
|
|
@@ -475,10 +481,11 @@ let StockService = class StockService {
|
|
|
475
481
|
};
|
|
476
482
|
StockService = __decorate([
|
|
477
483
|
Injectable(),
|
|
478
|
-
__param(
|
|
479
|
-
__param(
|
|
480
|
-
__param(
|
|
481
|
-
__metadata("design:paramtypes", [DataSource,
|
|
484
|
+
__param(2, Inject(StockEntity)),
|
|
485
|
+
__param(3, Inject(MaterialEntity)),
|
|
486
|
+
__param(4, Inject(WMS_CORE_MODULE_OPTIONS)),
|
|
487
|
+
__metadata("design:paramtypes", [DataSource,
|
|
488
|
+
WmsEntities, Object, Function, Object])
|
|
482
489
|
], StockService);
|
|
483
490
|
|
|
484
491
|
export { StockService };
|
|
@@ -5,6 +5,7 @@ import { HelperService } from './helper.service';
|
|
|
5
5
|
import { MaterialService } from './material.service';
|
|
6
6
|
import { BatchService } from './batch.service';
|
|
7
7
|
import { StockService } from './stock.service';
|
|
8
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
8
9
|
export type TransferCustomerOrderItemInput = {
|
|
9
10
|
materialId: string;
|
|
10
11
|
batchId: string;
|
|
@@ -16,6 +17,7 @@ export type TransferCustomerOrderItemInput = {
|
|
|
16
17
|
};
|
|
17
18
|
export declare class TransferCustomerOrderService<T extends TransferCustomerOrderEntityClass = TransferCustomerOrderEntityClass, K extends TransferCustomerOrderItemEntityClass = TransferCustomerOrderItemEntityClass> {
|
|
18
19
|
private readonly dataSource;
|
|
20
|
+
private readonly entities;
|
|
19
21
|
private readonly helperService;
|
|
20
22
|
private readonly materialService;
|
|
21
23
|
private readonly batchService;
|
|
@@ -24,7 +26,7 @@ export declare class TransferCustomerOrderService<T extends TransferCustomerOrde
|
|
|
24
26
|
readonly transferCustomerOrderItemEntity: EntityTarget<K>;
|
|
25
27
|
readonly stockEntity: EntityTarget<StockEntityClass>;
|
|
26
28
|
private readonly seqPrefix;
|
|
27
|
-
constructor(dataSource: DataSource, helperService: HelperService, materialService: MaterialService, batchService: BatchService, stockService: StockService, transferCustomerOrderEntity: EntityTarget<T>, transferCustomerOrderItemEntity: EntityTarget<K>, stockEntity: EntityTarget<StockEntityClass>);
|
|
29
|
+
constructor(dataSource: DataSource, entities: WmsEntities, helperService: HelperService, materialService: MaterialService, batchService: BatchService, stockService: StockService, transferCustomerOrderEntity: EntityTarget<T>, transferCustomerOrderItemEntity: EntityTarget<K>, stockEntity: EntityTarget<StockEntityClass>);
|
|
28
30
|
private getRepositories;
|
|
29
31
|
private processTransferCustomerOrderItems;
|
|
30
32
|
createTransferCustomerOrder(options: CreateTransferCustomerOrderInput, manager?: EntityManager): Promise<T>;
|
|
@@ -5,12 +5,14 @@ import '../models/metadata/batch-group.entity.js';
|
|
|
5
5
|
import { LoadersEntityClass } from '../models/metadata/loader.entity.js';
|
|
6
6
|
import '../models/metadata/loader-type.entity.js';
|
|
7
7
|
import '../models/metadata/loader-unit.entity.js';
|
|
8
|
-
import
|
|
8
|
+
import '../models/metadata/location.entity.js';
|
|
9
9
|
import '../models/metadata/material.entity.js';
|
|
10
10
|
import '../models/metadata/material-unit.entity.js';
|
|
11
|
+
import '@rytass/wms-base-nestjs-module';
|
|
11
12
|
import '../models/metadata/sale-order.entity.js';
|
|
12
13
|
import { StockEntity } from '../models/metadata/stock.entity.js';
|
|
13
14
|
import '../models/metadata/unit.entity.js';
|
|
15
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
14
16
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
15
17
|
import '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
16
18
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
@@ -48,8 +50,10 @@ import { TransferCustomerOrderChangeEntityClass } from '../models/extensions/tra
|
|
|
48
50
|
import '../models/extensions/scrape-order/scrape-order.entity.js';
|
|
49
51
|
import '../models/extensions/scrape-order/scrape-order-item.entity.js';
|
|
50
52
|
import '../models/extensions/scrape-order/scrape-order-change.entity.js';
|
|
53
|
+
import '../models/extensions/inventory-count-order/inventory-count-order.entity.js';
|
|
54
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-item.entity.js';
|
|
55
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-change.entity.js';
|
|
51
56
|
import { DataSource, Not, IsNull } from 'typeorm';
|
|
52
|
-
import { OrderEntity } from '@rytass/wms-base-nestjs-module';
|
|
53
57
|
import { HelperService } from './helper.service.js';
|
|
54
58
|
import { MaterialService } from './material.service.js';
|
|
55
59
|
import { BatchService } from './batch.service.js';
|
|
@@ -57,6 +61,7 @@ import { StockService } from './stock.service.js';
|
|
|
57
61
|
|
|
58
62
|
let TransferCustomerOrderService = class TransferCustomerOrderService {
|
|
59
63
|
dataSource;
|
|
64
|
+
entities;
|
|
60
65
|
helperService;
|
|
61
66
|
materialService;
|
|
62
67
|
batchService;
|
|
@@ -65,8 +70,9 @@ let TransferCustomerOrderService = class TransferCustomerOrderService {
|
|
|
65
70
|
transferCustomerOrderItemEntity;
|
|
66
71
|
stockEntity;
|
|
67
72
|
seqPrefix = 'TCO';
|
|
68
|
-
constructor(dataSource, helperService, materialService, batchService, stockService, transferCustomerOrderEntity, transferCustomerOrderItemEntity, stockEntity) {
|
|
73
|
+
constructor(dataSource, entities, helperService, materialService, batchService, stockService, transferCustomerOrderEntity, transferCustomerOrderItemEntity, stockEntity) {
|
|
69
74
|
this.dataSource = dataSource;
|
|
75
|
+
this.entities = entities;
|
|
70
76
|
this.helperService = helperService;
|
|
71
77
|
this.materialService = materialService;
|
|
72
78
|
this.batchService = batchService;
|
|
@@ -80,9 +86,9 @@ let TransferCustomerOrderService = class TransferCustomerOrderService {
|
|
|
80
86
|
transferCustomerOrder: manager.getRepository(this.transferCustomerOrderEntity),
|
|
81
87
|
transferCustomerOrderItem: manager.getRepository(this.transferCustomerOrderItemEntity),
|
|
82
88
|
transferCustomerOrderChange: manager.getRepository(TransferCustomerOrderChangeEntityClass),
|
|
83
|
-
order: manager.getRepository(
|
|
89
|
+
order: manager.getRepository(this.entities.order),
|
|
84
90
|
stock: manager.getRepository(this.stockEntity),
|
|
85
|
-
location: manager.getRepository(
|
|
91
|
+
location: manager.getRepository(this.entities.location),
|
|
86
92
|
loader: manager.getRepository(LoadersEntityClass),
|
|
87
93
|
};
|
|
88
94
|
}
|
|
@@ -266,10 +272,11 @@ let TransferCustomerOrderService = class TransferCustomerOrderService {
|
|
|
266
272
|
};
|
|
267
273
|
TransferCustomerOrderService = __decorate([
|
|
268
274
|
Injectable(),
|
|
269
|
-
__param(
|
|
270
|
-
__param(
|
|
271
|
-
__param(
|
|
275
|
+
__param(6, Inject(TransferCustomerOrderEntity)),
|
|
276
|
+
__param(7, Inject(TransferCustomerOrderItemEntity)),
|
|
277
|
+
__param(8, Inject(StockEntity)),
|
|
272
278
|
__metadata("design:paramtypes", [DataSource,
|
|
279
|
+
WmsEntities,
|
|
273
280
|
HelperService,
|
|
274
281
|
MaterialService,
|
|
275
282
|
BatchService,
|
|
@@ -8,8 +8,10 @@ import { CancelTransferOrderInput } from '../typings/cancel-transfer-order.input
|
|
|
8
8
|
import { MaterialService } from './material.service';
|
|
9
9
|
import { BatchService } from './batch.service';
|
|
10
10
|
import { StockService } from './stock.service';
|
|
11
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
11
12
|
export declare class TransferOrderService<T extends TransferOrderEntityClass = TransferOrderEntityClass, K extends TransferOrderItemEntityClass = TransferOrderItemEntityClass> {
|
|
12
13
|
private readonly dataSource;
|
|
14
|
+
private readonly entities;
|
|
13
15
|
private readonly helperService;
|
|
14
16
|
private readonly materialService;
|
|
15
17
|
private readonly batchService;
|
|
@@ -19,7 +21,7 @@ export declare class TransferOrderService<T extends TransferOrderEntityClass = T
|
|
|
19
21
|
readonly stockEntity: EntityTarget<StockEntityClass>;
|
|
20
22
|
private readonly seqPrefix;
|
|
21
23
|
readonly transferOrderRepository: Repository<T>;
|
|
22
|
-
constructor(dataSource: DataSource, helperService: HelperService, materialService: MaterialService, batchService: BatchService, stockService: StockService, transferOrderEntity: EntityTarget<T>, transferOrderItemEntity: EntityTarget<K>, stockEntity: EntityTarget<StockEntityClass>);
|
|
24
|
+
constructor(dataSource: DataSource, entities: WmsEntities, helperService: HelperService, materialService: MaterialService, batchService: BatchService, stockService: StockService, transferOrderEntity: EntityTarget<T>, transferOrderItemEntity: EntityTarget<K>, stockEntity: EntityTarget<StockEntityClass>);
|
|
23
25
|
private getRepositories;
|
|
24
26
|
/**
|
|
25
27
|
* Process transfer order items (create transfer records and update stock)
|
|
@@ -8,9 +8,11 @@ import '../models/metadata/loader-unit.entity.js';
|
|
|
8
8
|
import '../models/metadata/location.entity.js';
|
|
9
9
|
import '../models/metadata/material.entity.js';
|
|
10
10
|
import '../models/metadata/material-unit.entity.js';
|
|
11
|
+
import '@rytass/wms-base-nestjs-module';
|
|
11
12
|
import '../models/metadata/sale-order.entity.js';
|
|
12
13
|
import { StockEntity } from '../models/metadata/stock.entity.js';
|
|
13
14
|
import '../models/metadata/unit.entity.js';
|
|
15
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
14
16
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
15
17
|
import '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
16
18
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
@@ -48,9 +50,11 @@ import '../models/extensions/transfer-customer-order/transfer-customer-order-cha
|
|
|
48
50
|
import '../models/extensions/scrape-order/scrape-order.entity.js';
|
|
49
51
|
import '../models/extensions/scrape-order/scrape-order-item.entity.js';
|
|
50
52
|
import '../models/extensions/scrape-order/scrape-order-change.entity.js';
|
|
53
|
+
import '../models/extensions/inventory-count-order/inventory-count-order.entity.js';
|
|
54
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-item.entity.js';
|
|
55
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-change.entity.js';
|
|
51
56
|
import { DataSource, In } from 'typeorm';
|
|
52
57
|
import { StockStatus } from '../constants/stock-status.js';
|
|
53
|
-
import { OrderEntity } from '@rytass/wms-base-nestjs-module';
|
|
54
58
|
import { HelperService } from './helper.service.js';
|
|
55
59
|
import { MaterialService } from './material.service.js';
|
|
56
60
|
import { BatchService } from './batch.service.js';
|
|
@@ -58,6 +62,7 @@ import { StockService } from './stock.service.js';
|
|
|
58
62
|
|
|
59
63
|
let TransferOrderService = class TransferOrderService {
|
|
60
64
|
dataSource;
|
|
65
|
+
entities;
|
|
61
66
|
helperService;
|
|
62
67
|
materialService;
|
|
63
68
|
batchService;
|
|
@@ -67,8 +72,9 @@ let TransferOrderService = class TransferOrderService {
|
|
|
67
72
|
stockEntity;
|
|
68
73
|
seqPrefix = 'TO';
|
|
69
74
|
transferOrderRepository;
|
|
70
|
-
constructor(dataSource, helperService, materialService, batchService, stockService, transferOrderEntity, transferOrderItemEntity, stockEntity) {
|
|
75
|
+
constructor(dataSource, entities, helperService, materialService, batchService, stockService, transferOrderEntity, transferOrderItemEntity, stockEntity) {
|
|
71
76
|
this.dataSource = dataSource;
|
|
77
|
+
this.entities = entities;
|
|
72
78
|
this.helperService = helperService;
|
|
73
79
|
this.materialService = materialService;
|
|
74
80
|
this.batchService = batchService;
|
|
@@ -83,7 +89,7 @@ let TransferOrderService = class TransferOrderService {
|
|
|
83
89
|
transferOrder: manager.getRepository(this.transferOrderEntity),
|
|
84
90
|
transferOrderItem: manager.getRepository(this.transferOrderItemEntity),
|
|
85
91
|
transferOrderChange: manager.getRepository(TransferOrderChangeEntityClass),
|
|
86
|
-
order: manager.getRepository(
|
|
92
|
+
order: manager.getRepository(this.entities.order),
|
|
87
93
|
stock: manager.getRepository(this.stockEntity),
|
|
88
94
|
loader: manager.getRepository(LoadersEntityClass),
|
|
89
95
|
};
|
|
@@ -561,7 +567,7 @@ let TransferOrderService = class TransferOrderService {
|
|
|
561
567
|
manager,
|
|
562
568
|
});
|
|
563
569
|
// Record the transfer change
|
|
564
|
-
const base = await manager.getRepository(
|
|
570
|
+
const base = await manager.getRepository(this.entities.order).save({});
|
|
565
571
|
// Availability check at the IN_TRANSFER coord — must have ≥ qty to drain
|
|
566
572
|
await this.stockService.validateStockAvailability({
|
|
567
573
|
materialId: item.materialId,
|
|
@@ -619,10 +625,11 @@ let TransferOrderService = class TransferOrderService {
|
|
|
619
625
|
};
|
|
620
626
|
TransferOrderService = __decorate([
|
|
621
627
|
Injectable(),
|
|
622
|
-
__param(
|
|
623
|
-
__param(
|
|
624
|
-
__param(
|
|
628
|
+
__param(6, Inject(TransferOrderEntity)),
|
|
629
|
+
__param(7, Inject(TransferOrderItemEntity)),
|
|
630
|
+
__param(8, Inject(StockEntity)),
|
|
625
631
|
__metadata("design:paramtypes", [DataSource,
|
|
632
|
+
WmsEntities,
|
|
626
633
|
HelperService,
|
|
627
634
|
MaterialService,
|
|
628
635
|
BatchService,
|
|
@@ -5,6 +5,7 @@ import { HelperService } from './helper.service';
|
|
|
5
5
|
import { MaterialService } from './material.service';
|
|
6
6
|
import { BatchService } from './batch.service';
|
|
7
7
|
import { StockService } from './stock.service';
|
|
8
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
8
9
|
export type TransferVendorOrderItemInput = {
|
|
9
10
|
materialId: string;
|
|
10
11
|
batchId: string;
|
|
@@ -16,6 +17,7 @@ export type TransferVendorOrderItemInput = {
|
|
|
16
17
|
};
|
|
17
18
|
export declare class TransferVendorOrderService<T extends TransferVendorOrderEntityClass = TransferVendorOrderEntityClass, K extends TransferVendorOrderItemEntityClass = TransferVendorOrderItemEntityClass> {
|
|
18
19
|
private readonly dataSource;
|
|
20
|
+
private readonly entities;
|
|
19
21
|
private readonly helperService;
|
|
20
22
|
private readonly materialService;
|
|
21
23
|
private readonly batchService;
|
|
@@ -24,7 +26,7 @@ export declare class TransferVendorOrderService<T extends TransferVendorOrderEnt
|
|
|
24
26
|
readonly transferVendorOrderItemEntity: EntityTarget<K>;
|
|
25
27
|
readonly stockEntity: EntityTarget<StockEntityClass>;
|
|
26
28
|
private readonly seqPrefix;
|
|
27
|
-
constructor(dataSource: DataSource, helperService: HelperService, materialService: MaterialService, batchService: BatchService, stockService: StockService, transferVendorOrderEntity: EntityTarget<T>, transferVendorOrderItemEntity: EntityTarget<K>, stockEntity: EntityTarget<StockEntityClass>);
|
|
29
|
+
constructor(dataSource: DataSource, entities: WmsEntities, helperService: HelperService, materialService: MaterialService, batchService: BatchService, stockService: StockService, transferVendorOrderEntity: EntityTarget<T>, transferVendorOrderItemEntity: EntityTarget<K>, stockEntity: EntityTarget<StockEntityClass>);
|
|
28
30
|
private getRepositories;
|
|
29
31
|
private processTransferVendorOrderItems;
|
|
30
32
|
createTransferVendorOrder(options: CreateTransferVendorOrderInput, manager?: EntityManager): Promise<T>;
|
|
@@ -5,12 +5,14 @@ import '../models/metadata/batch-group.entity.js';
|
|
|
5
5
|
import { LoadersEntityClass } from '../models/metadata/loader.entity.js';
|
|
6
6
|
import '../models/metadata/loader-type.entity.js';
|
|
7
7
|
import '../models/metadata/loader-unit.entity.js';
|
|
8
|
-
import
|
|
8
|
+
import '../models/metadata/location.entity.js';
|
|
9
9
|
import '../models/metadata/material.entity.js';
|
|
10
10
|
import '../models/metadata/material-unit.entity.js';
|
|
11
|
+
import '@rytass/wms-base-nestjs-module';
|
|
11
12
|
import '../models/metadata/sale-order.entity.js';
|
|
12
13
|
import { StockEntity } from '../models/metadata/stock.entity.js';
|
|
13
14
|
import '../models/metadata/unit.entity.js';
|
|
15
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
14
16
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
15
17
|
import '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
16
18
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
@@ -48,8 +50,10 @@ import '../models/extensions/transfer-customer-order/transfer-customer-order-cha
|
|
|
48
50
|
import '../models/extensions/scrape-order/scrape-order.entity.js';
|
|
49
51
|
import '../models/extensions/scrape-order/scrape-order-item.entity.js';
|
|
50
52
|
import '../models/extensions/scrape-order/scrape-order-change.entity.js';
|
|
53
|
+
import '../models/extensions/inventory-count-order/inventory-count-order.entity.js';
|
|
54
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-item.entity.js';
|
|
55
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-change.entity.js';
|
|
51
56
|
import { DataSource, Not, IsNull } from 'typeorm';
|
|
52
|
-
import { OrderEntity } from '@rytass/wms-base-nestjs-module';
|
|
53
57
|
import { HelperService } from './helper.service.js';
|
|
54
58
|
import { MaterialService } from './material.service.js';
|
|
55
59
|
import { BatchService } from './batch.service.js';
|
|
@@ -57,6 +61,7 @@ import { StockService } from './stock.service.js';
|
|
|
57
61
|
|
|
58
62
|
let TransferVendorOrderService = class TransferVendorOrderService {
|
|
59
63
|
dataSource;
|
|
64
|
+
entities;
|
|
60
65
|
helperService;
|
|
61
66
|
materialService;
|
|
62
67
|
batchService;
|
|
@@ -65,8 +70,9 @@ let TransferVendorOrderService = class TransferVendorOrderService {
|
|
|
65
70
|
transferVendorOrderItemEntity;
|
|
66
71
|
stockEntity;
|
|
67
72
|
seqPrefix = 'TVO';
|
|
68
|
-
constructor(dataSource, helperService, materialService, batchService, stockService, transferVendorOrderEntity, transferVendorOrderItemEntity, stockEntity) {
|
|
73
|
+
constructor(dataSource, entities, helperService, materialService, batchService, stockService, transferVendorOrderEntity, transferVendorOrderItemEntity, stockEntity) {
|
|
69
74
|
this.dataSource = dataSource;
|
|
75
|
+
this.entities = entities;
|
|
70
76
|
this.helperService = helperService;
|
|
71
77
|
this.materialService = materialService;
|
|
72
78
|
this.batchService = batchService;
|
|
@@ -80,9 +86,9 @@ let TransferVendorOrderService = class TransferVendorOrderService {
|
|
|
80
86
|
transferVendorOrder: manager.getRepository(this.transferVendorOrderEntity),
|
|
81
87
|
transferVendorOrderItem: manager.getRepository(this.transferVendorOrderItemEntity),
|
|
82
88
|
transferVendorOrderChange: manager.getRepository(TransferVendorOrderChangeEntityClass),
|
|
83
|
-
order: manager.getRepository(
|
|
89
|
+
order: manager.getRepository(this.entities.order),
|
|
84
90
|
stock: manager.getRepository(this.stockEntity),
|
|
85
|
-
location: manager.getRepository(
|
|
91
|
+
location: manager.getRepository(this.entities.location),
|
|
86
92
|
loader: manager.getRepository(LoadersEntityClass),
|
|
87
93
|
};
|
|
88
94
|
}
|
|
@@ -266,10 +272,11 @@ let TransferVendorOrderService = class TransferVendorOrderService {
|
|
|
266
272
|
};
|
|
267
273
|
TransferVendorOrderService = __decorate([
|
|
268
274
|
Injectable(),
|
|
269
|
-
__param(
|
|
270
|
-
__param(
|
|
271
|
-
__param(
|
|
275
|
+
__param(6, Inject(TransferVendorOrderEntity)),
|
|
276
|
+
__param(7, Inject(TransferVendorOrderItemEntity)),
|
|
277
|
+
__param(8, Inject(StockEntity)),
|
|
272
278
|
__metadata("design:paramtypes", [DataSource,
|
|
279
|
+
WmsEntities,
|
|
273
280
|
HelperService,
|
|
274
281
|
MaterialService,
|
|
275
282
|
BatchService,
|
|
@@ -9,9 +9,11 @@ import '../models/metadata/loader-unit.entity.js';
|
|
|
9
9
|
import '../models/metadata/location.entity.js';
|
|
10
10
|
import '../models/metadata/material.entity.js';
|
|
11
11
|
import '../models/metadata/material-unit.entity.js';
|
|
12
|
+
import '@rytass/wms-base-nestjs-module';
|
|
12
13
|
import '../models/metadata/sale-order.entity.js';
|
|
13
14
|
import '../models/metadata/stock.entity.js';
|
|
14
15
|
import { UnitEntityClass } from '../models/metadata/unit.entity.js';
|
|
16
|
+
import '../models/wms-entities.js';
|
|
15
17
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
16
18
|
import '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
17
19
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
@@ -49,6 +51,9 @@ import '../models/extensions/transfer-customer-order/transfer-customer-order-cha
|
|
|
49
51
|
import '../models/extensions/scrape-order/scrape-order.entity.js';
|
|
50
52
|
import '../models/extensions/scrape-order/scrape-order-item.entity.js';
|
|
51
53
|
import '../models/extensions/scrape-order/scrape-order-change.entity.js';
|
|
54
|
+
import '../models/extensions/inventory-count-order/inventory-count-order.entity.js';
|
|
55
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-item.entity.js';
|
|
56
|
+
import '../models/extensions/inventory-count-order/inventory-count-order-change.entity.js';
|
|
52
57
|
|
|
53
58
|
let UnitService = class UnitService {
|
|
54
59
|
dataSource;
|
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
import { OnApplicationBootstrap } from '@nestjs/common';
|
|
2
2
|
import { DataSource, Repository } from 'typeorm';
|
|
3
3
|
import { WarehouseMapEntity } from '@rytass/wms-base-nestjs-module/models/warehouse-map.entity';
|
|
4
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
4
5
|
export declare class WarehouseMapDataService implements OnApplicationBootstrap {
|
|
5
6
|
private readonly dataSource;
|
|
7
|
+
private readonly entities;
|
|
6
8
|
readonly defaultMapDataKey = "DEFAULT_MAP_DATA_KEY";
|
|
7
9
|
readonly warehouseMapDataRepository: Repository<WarehouseMapEntity>;
|
|
8
|
-
constructor(dataSource: DataSource);
|
|
9
|
-
|
|
10
|
+
constructor(dataSource: DataSource, entities: WmsEntities);
|
|
11
|
+
/**
|
|
12
|
+
* Seed the default map row.
|
|
13
|
+
*
|
|
14
|
+
* `async` on purpose: Nest awaits a returned promise, so bootstrap does not
|
|
15
|
+
* complete until the seed transaction has committed. Firing it off without
|
|
16
|
+
* awaiting used to leave a transaction in flight after `app.init()` resolved
|
|
17
|
+
* — an app that shut down promptly (a test, a short-lived worker) destroyed
|
|
18
|
+
* the pool underneath it and the rejection surfaced as an unhandled
|
|
19
|
+
* `QueryFailedError: Connection terminated` that killed the process.
|
|
20
|
+
*/
|
|
21
|
+
onApplicationBootstrap(): Promise<void>;
|
|
10
22
|
}
|
|
@@ -1,24 +1,35 @@
|
|
|
1
1
|
import { __decorate, __metadata } from 'tslib';
|
|
2
2
|
import { Injectable } from '@nestjs/common';
|
|
3
3
|
import { DataSource } from 'typeorm';
|
|
4
|
-
import {
|
|
4
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
5
5
|
|
|
6
6
|
let WarehouseMapDataService = class WarehouseMapDataService {
|
|
7
7
|
dataSource;
|
|
8
|
+
entities;
|
|
8
9
|
defaultMapDataKey = 'DEFAULT_MAP_DATA_KEY';
|
|
9
10
|
warehouseMapDataRepository;
|
|
10
|
-
constructor(dataSource) {
|
|
11
|
+
constructor(dataSource, entities) {
|
|
11
12
|
this.dataSource = dataSource;
|
|
12
|
-
this.
|
|
13
|
-
|
|
13
|
+
this.entities = entities;
|
|
14
|
+
this.warehouseMapDataRepository = this.dataSource.getRepository(this.entities.warehouseMap);
|
|
14
15
|
}
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
/**
|
|
17
|
+
* Seed the default map row.
|
|
18
|
+
*
|
|
19
|
+
* `async` on purpose: Nest awaits a returned promise, so bootstrap does not
|
|
20
|
+
* complete until the seed transaction has committed. Firing it off without
|
|
21
|
+
* awaiting used to leave a transaction in flight after `app.init()` resolved
|
|
22
|
+
* — an app that shut down promptly (a test, a short-lived worker) destroyed
|
|
23
|
+
* the pool underneath it and the rejection surfaced as an unhandled
|
|
24
|
+
* `QueryFailedError: Connection terminated` that killed the process.
|
|
25
|
+
*/
|
|
26
|
+
async onApplicationBootstrap() {
|
|
27
|
+
await this.dataSource.transaction(async (manager) => {
|
|
17
28
|
const defaultMapData = await manager
|
|
18
|
-
.getRepository(
|
|
29
|
+
.getRepository(this.entities.warehouseMap)
|
|
19
30
|
.findOneBy({ id: this.defaultMapDataKey });
|
|
20
31
|
if (!defaultMapData) {
|
|
21
|
-
await manager.getRepository(
|
|
32
|
+
await manager.getRepository(this.entities.warehouseMap).save(manager.getRepository(this.entities.warehouseMap).create({
|
|
22
33
|
id: this.defaultMapDataKey,
|
|
23
34
|
mapData: {
|
|
24
35
|
id: this.defaultMapDataKey,
|
|
@@ -32,7 +43,8 @@ let WarehouseMapDataService = class WarehouseMapDataService {
|
|
|
32
43
|
};
|
|
33
44
|
WarehouseMapDataService = __decorate([
|
|
34
45
|
Injectable(),
|
|
35
|
-
__metadata("design:paramtypes", [DataSource
|
|
46
|
+
__metadata("design:paramtypes", [DataSource,
|
|
47
|
+
WmsEntities])
|
|
36
48
|
], WarehouseMapDataService);
|
|
37
49
|
|
|
38
50
|
export { WarehouseMapDataService };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rytass/wms-module-core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.0",
|
|
4
4
|
"description": "Rytass WMS Module — NestJS services and TypeORM entities for warehouse management",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"rytass",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"access": "public"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@rytass/wms-base-nestjs-module": "0.
|
|
44
|
+
"@rytass/wms-base-nestjs-module": "0.4.0"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"@nestjs/common": "^11.0.0",
|