@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, In } 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 MergeBatchOrderService = class MergeBatchOrderService {
|
|
59
63
|
dataSource;
|
|
64
|
+
entities;
|
|
60
65
|
materialService;
|
|
61
66
|
batchService;
|
|
62
67
|
helperService;
|
|
@@ -64,8 +69,9 @@ let MergeBatchOrderService = class MergeBatchOrderService {
|
|
|
64
69
|
mergeBatchOrderEntity;
|
|
65
70
|
mergeBatchOrderItemEntity;
|
|
66
71
|
seqPrefix = 'MBO';
|
|
67
|
-
constructor(dataSource, materialService, batchService, helperService, stockService, mergeBatchOrderEntity, mergeBatchOrderItemEntity) {
|
|
72
|
+
constructor(dataSource, entities, materialService, batchService, helperService, stockService, mergeBatchOrderEntity, mergeBatchOrderItemEntity) {
|
|
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 MergeBatchOrderService = class MergeBatchOrderService {
|
|
|
78
84
|
const mergeBatchOrderRepository = manager.getRepository(this.mergeBatchOrderEntity);
|
|
79
85
|
const mergeBatchOrderItemRepository = manager.getRepository(this.mergeBatchOrderItemEntity);
|
|
80
86
|
const mergeBatchOrderChangeRepository = manager.getRepository(MergeBatchOrderChangeEntityClass);
|
|
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
|
// Verify all source batches have identical metadata (except key and groupId)
|
|
85
91
|
const sourceBatches = await batchRepository.find({
|
|
86
92
|
where: { id: In(options.items.map((item) => item.batchId)) },
|
|
@@ -183,9 +189,10 @@ let MergeBatchOrderService = class MergeBatchOrderService {
|
|
|
183
189
|
};
|
|
184
190
|
MergeBatchOrderService = __decorate([
|
|
185
191
|
Injectable(),
|
|
186
|
-
__param(
|
|
187
|
-
__param(
|
|
192
|
+
__param(6, Inject(MergeBatchOrderEntity)),
|
|
193
|
+
__param(7, Inject(MergeBatchOrderItemEntity)),
|
|
188
194
|
__metadata("design:paramtypes", [DataSource,
|
|
195
|
+
WmsEntities,
|
|
189
196
|
MaterialService,
|
|
190
197
|
BatchService,
|
|
191
198
|
HelperService,
|
|
@@ -4,14 +4,16 @@ import { CreateInspectionOrderInput } from '../typings/create-inspection-order.i
|
|
|
4
4
|
import { BatchService } from './batch.service';
|
|
5
5
|
import { MaterialService } from './material.service';
|
|
6
6
|
import { StockService } from './stock.service';
|
|
7
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
7
8
|
export declare class QualityInspectionOrderService<T extends QualityInspectionOrderEntityClass = QualityInspectionOrderEntityClass, K extends QualityInspectionOrderItemEntityClass = QualityInspectionOrderItemEntityClass> {
|
|
8
9
|
private readonly dataSource;
|
|
10
|
+
private readonly entities;
|
|
9
11
|
readonly qualityInspectionOrderEntity: EntityTarget<T>;
|
|
10
12
|
readonly qualityInspectionOrderItemEntity: EntityTarget<K>;
|
|
11
13
|
private readonly batchService;
|
|
12
14
|
private readonly materialService;
|
|
13
15
|
private readonly stockService;
|
|
14
|
-
constructor(dataSource: DataSource, qualityInspectionOrderEntity: EntityTarget<T>, qualityInspectionOrderItemEntity: EntityTarget<K>, batchService: BatchService, materialService: MaterialService, stockService: StockService);
|
|
16
|
+
constructor(dataSource: DataSource, entities: WmsEntities, qualityInspectionOrderEntity: EntityTarget<T>, qualityInspectionOrderItemEntity: EntityTarget<K>, batchService: BatchService, materialService: MaterialService, stockService: StockService);
|
|
15
17
|
inspect({ manager, options, }: {
|
|
16
18
|
manager?: EntityManager;
|
|
17
19
|
options: CreateInspectionOrderInput;
|
|
@@ -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,21 +50,25 @@ 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 { BatchService } from './batch.service.js';
|
|
54
58
|
import { MaterialService } from './material.service.js';
|
|
55
59
|
import { StockService } from './stock.service.js';
|
|
56
60
|
|
|
57
61
|
let QualityInspectionOrderService = class QualityInspectionOrderService {
|
|
58
62
|
dataSource;
|
|
63
|
+
entities;
|
|
59
64
|
qualityInspectionOrderEntity;
|
|
60
65
|
qualityInspectionOrderItemEntity;
|
|
61
66
|
batchService;
|
|
62
67
|
materialService;
|
|
63
68
|
stockService;
|
|
64
|
-
constructor(dataSource, qualityInspectionOrderEntity, qualityInspectionOrderItemEntity, batchService, materialService, stockService) {
|
|
69
|
+
constructor(dataSource, entities, qualityInspectionOrderEntity, qualityInspectionOrderItemEntity, batchService, materialService, stockService) {
|
|
65
70
|
this.dataSource = dataSource;
|
|
71
|
+
this.entities = entities;
|
|
66
72
|
this.qualityInspectionOrderEntity = qualityInspectionOrderEntity;
|
|
67
73
|
this.qualityInspectionOrderItemEntity = qualityInspectionOrderItemEntity;
|
|
68
74
|
this.batchService = batchService;
|
|
@@ -70,11 +76,11 @@ let QualityInspectionOrderService = class QualityInspectionOrderService {
|
|
|
70
76
|
this.stockService = stockService;
|
|
71
77
|
}
|
|
72
78
|
async inspect({ manager = this.dataSource.manager, options, }) {
|
|
73
|
-
const orderRepository = manager.getRepository(
|
|
79
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
74
80
|
const qualityInspectionOrderRepository = manager.getRepository(this.qualityInspectionOrderEntity);
|
|
75
81
|
const qualityInspectionOrderItemRepository = manager.getRepository(this.qualityInspectionOrderItemEntity);
|
|
76
82
|
const qualityInspectionOrderChangeRepository = manager.getRepository(QualityInspectionOrderChangeEntityClass);
|
|
77
|
-
const stockRepository = manager.getRepository(
|
|
83
|
+
const stockRepository = manager.getRepository(this.entities.stock);
|
|
78
84
|
const order = await qualityInspectionOrderRepository.save(qualityInspectionOrderRepository.create({
|
|
79
85
|
key: options.key,
|
|
80
86
|
note: options.note,
|
|
@@ -125,9 +131,10 @@ let QualityInspectionOrderService = class QualityInspectionOrderService {
|
|
|
125
131
|
};
|
|
126
132
|
QualityInspectionOrderService = __decorate([
|
|
127
133
|
Injectable(),
|
|
128
|
-
__param(
|
|
129
|
-
__param(
|
|
130
|
-
__metadata("design:paramtypes", [DataSource,
|
|
134
|
+
__param(2, Inject(QualityInspectionOrderEntity)),
|
|
135
|
+
__param(3, Inject(QualityInspectionOrderItemEntity)),
|
|
136
|
+
__metadata("design:paramtypes", [DataSource,
|
|
137
|
+
WmsEntities, Object, Object, BatchService,
|
|
131
138
|
MaterialService,
|
|
132
139
|
StockService])
|
|
133
140
|
], QualityInspectionOrderService);
|
|
@@ -8,6 +8,7 @@ import { MaterialService } from './material.service';
|
|
|
8
8
|
import { BatchService } from './batch.service';
|
|
9
9
|
import { HelperService } from './helper.service';
|
|
10
10
|
import { StockService } from './stock.service';
|
|
11
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
11
12
|
/**
|
|
12
13
|
* Service for managing receive inventory orders and their items
|
|
13
14
|
* Supports dynamic entity injection for customization
|
|
@@ -16,6 +17,7 @@ import { StockService } from './stock.service';
|
|
|
16
17
|
*/
|
|
17
18
|
export declare class ReceiveInventoryOrderService<T extends ReceiveInventoryOrderEntityClass = ReceiveInventoryOrderEntityClass, K extends ReceiveInventoryOrderItemEntityClass = ReceiveInventoryOrderItemEntityClass> {
|
|
18
19
|
private readonly dataSource;
|
|
20
|
+
private readonly entities;
|
|
19
21
|
private readonly materialService;
|
|
20
22
|
private readonly batchService;
|
|
21
23
|
private readonly helperService;
|
|
@@ -23,7 +25,7 @@ export declare class ReceiveInventoryOrderService<T extends ReceiveInventoryOrde
|
|
|
23
25
|
readonly receiveInventoryOrderEntity: EntityTarget<T>;
|
|
24
26
|
readonly receiveInventoryOrderItemEntity: EntityTarget<K>;
|
|
25
27
|
readonly selectQueryBuilder: (alias: string) => SelectQueryBuilder<T>;
|
|
26
|
-
constructor(dataSource: DataSource, materialService: MaterialService, batchService: BatchService, helperService: HelperService, stockService: StockService, receiveInventoryOrderEntity: EntityTarget<T>, receiveInventoryOrderItemEntity: EntityTarget<K>);
|
|
28
|
+
constructor(dataSource: DataSource, entities: WmsEntities, materialService: MaterialService, batchService: BatchService, helperService: HelperService, stockService: StockService, receiveInventoryOrderEntity: EntityTarget<T>, receiveInventoryOrderItemEntity: EntityTarget<K>);
|
|
27
29
|
private processReceiveInventoryOrderItems;
|
|
28
30
|
createReceiveInventoryOrder({ manager, ...options }: CreateReceiveInventoryOrderInput & {
|
|
29
31
|
manager?: EntityManager;
|
|
@@ -3,19 +3,20 @@ import { Injectable, Inject } from '@nestjs/common';
|
|
|
3
3
|
import { ReceiveInventoryOrderEntity } from '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
4
4
|
import { ReceiveInventoryOrderItemEntity } from '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
5
5
|
import { DataSource, IsNull, In } from 'typeorm';
|
|
6
|
-
import { OrderEntity } from '@rytass/wms-base-nestjs-module';
|
|
7
6
|
import { ReceiveInventoryOrderStatus } from '../typings/find-receive-inventory-order.input.js';
|
|
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 '../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.entity.js';
|
|
15
14
|
import '../models/metadata/material-unit.entity.js';
|
|
15
|
+
import '@rytass/wms-base-nestjs-module';
|
|
16
16
|
import '../models/metadata/sale-order.entity.js';
|
|
17
|
-
import
|
|
17
|
+
import '../models/metadata/stock.entity.js';
|
|
18
18
|
import '../models/metadata/unit.entity.js';
|
|
19
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
19
20
|
import { ReceiveInventoryOrderChangeEntityClass } from '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
20
21
|
import '../models/extensions/ship-inventory-order/ship-inventory-order-item.entity.js';
|
|
21
22
|
import '../models/extensions/ship-inventory-order/ship-inventory-order.entity.js';
|
|
@@ -51,6 +52,9 @@ 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 { MaterialService } from './material.service.js';
|
|
55
59
|
import { BatchService } from './batch.service.js';
|
|
56
60
|
import { HelperService } from './helper.service.js';
|
|
@@ -64,6 +68,7 @@ import { StockService } from './stock.service.js';
|
|
|
64
68
|
*/
|
|
65
69
|
let ReceiveInventoryOrderService = class ReceiveInventoryOrderService {
|
|
66
70
|
dataSource;
|
|
71
|
+
entities;
|
|
67
72
|
materialService;
|
|
68
73
|
batchService;
|
|
69
74
|
helperService;
|
|
@@ -71,8 +76,9 @@ let ReceiveInventoryOrderService = class ReceiveInventoryOrderService {
|
|
|
71
76
|
receiveInventoryOrderEntity;
|
|
72
77
|
receiveInventoryOrderItemEntity;
|
|
73
78
|
selectQueryBuilder;
|
|
74
|
-
constructor(dataSource, materialService, batchService, helperService, stockService, receiveInventoryOrderEntity, receiveInventoryOrderItemEntity) {
|
|
79
|
+
constructor(dataSource, entities, materialService, batchService, helperService, stockService, receiveInventoryOrderEntity, receiveInventoryOrderItemEntity) {
|
|
75
80
|
this.dataSource = dataSource;
|
|
81
|
+
this.entities = entities;
|
|
76
82
|
this.materialService = materialService;
|
|
77
83
|
this.batchService = batchService;
|
|
78
84
|
this.helperService = helperService;
|
|
@@ -123,7 +129,7 @@ let ReceiveInventoryOrderService = class ReceiveInventoryOrderService {
|
|
|
123
129
|
}
|
|
124
130
|
processReceiveInventoryOrderItems(items, orderId, manager) {
|
|
125
131
|
const materialRepository = manager.getRepository(this.materialService.materialEntity);
|
|
126
|
-
const locationRepository = manager.getRepository(
|
|
132
|
+
const locationRepository = manager.getRepository(this.entities.location);
|
|
127
133
|
const loaderRepository = manager.getRepository(LoadersEntityClass);
|
|
128
134
|
return items.reduce(async (accPromise, item) => {
|
|
129
135
|
const acc = await accPromise;
|
|
@@ -168,7 +174,7 @@ let ReceiveInventoryOrderService = class ReceiveInventoryOrderService {
|
|
|
168
174
|
}, Promise.resolve([]));
|
|
169
175
|
}
|
|
170
176
|
async createReceiveInventoryOrder({ manager = this.dataSource.manager, ...options }) {
|
|
171
|
-
const orderRepository = manager.getRepository(
|
|
177
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
172
178
|
const receiveInventoryOrderRepository = manager.getRepository(this.receiveInventoryOrderEntity);
|
|
173
179
|
const receiveInventoryOrderItemRepository = manager.getRepository(this.receiveInventoryOrderItemEntity);
|
|
174
180
|
// create base order
|
|
@@ -302,10 +308,10 @@ let ReceiveInventoryOrderService = class ReceiveInventoryOrderService {
|
|
|
302
308
|
return this.dataSource.transaction(async (manager) => {
|
|
303
309
|
const changeRepository = manager.getRepository(ReceiveInventoryOrderChangeEntityClass);
|
|
304
310
|
const itemRepository = manager.getRepository(this.receiveInventoryOrderItemEntity);
|
|
305
|
-
const orderRepository = manager.getRepository(
|
|
306
|
-
const locationRepository = manager.getRepository(
|
|
311
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
312
|
+
const locationRepository = manager.getRepository(this.entities.location);
|
|
307
313
|
const loaderRepository = manager.getRepository(LoadersEntityClass);
|
|
308
|
-
const stockRepository = manager.getRepository(
|
|
314
|
+
const stockRepository = manager.getRepository(this.entities.stock);
|
|
309
315
|
const items = await itemRepository.find({
|
|
310
316
|
where: { id: In(options.map((o) => o.itemId)) },
|
|
311
317
|
relations: ['changes'],
|
|
@@ -395,9 +401,10 @@ let ReceiveInventoryOrderService = class ReceiveInventoryOrderService {
|
|
|
395
401
|
};
|
|
396
402
|
ReceiveInventoryOrderService = __decorate([
|
|
397
403
|
Injectable(),
|
|
398
|
-
__param(
|
|
399
|
-
__param(
|
|
404
|
+
__param(6, Inject(ReceiveInventoryOrderEntity)),
|
|
405
|
+
__param(7, Inject(ReceiveInventoryOrderItemEntity)),
|
|
400
406
|
__metadata("design:paramtypes", [DataSource,
|
|
407
|
+
WmsEntities,
|
|
401
408
|
MaterialService,
|
|
402
409
|
BatchService,
|
|
403
410
|
HelperService,
|
|
@@ -5,8 +5,10 @@ import { MaterialService } from './material.service';
|
|
|
5
5
|
import { BatchService } from './batch.service';
|
|
6
6
|
import { HelperService } from './helper.service';
|
|
7
7
|
import { StockService } from './stock.service';
|
|
8
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
8
9
|
export declare class ReclassifyInventoryOrderService<T extends ReclassifyInventoryOrderEntityClass = ReclassifyInventoryOrderEntityClass, K extends ReclassifyInventoryOrderItemEntityClass = ReclassifyInventoryOrderItemEntityClass> {
|
|
9
10
|
private readonly dataSource;
|
|
11
|
+
private readonly entities;
|
|
10
12
|
private readonly materialService;
|
|
11
13
|
private readonly batchService;
|
|
12
14
|
private readonly helperService;
|
|
@@ -14,6 +16,6 @@ export declare class ReclassifyInventoryOrderService<T extends ReclassifyInvento
|
|
|
14
16
|
readonly reclassifyInventoryOrderEntity: EntityTarget<T>;
|
|
15
17
|
readonly reclassifyInventoryOrderItemEntity: EntityTarget<K>;
|
|
16
18
|
private readonly seqPrefix;
|
|
17
|
-
constructor(dataSource: DataSource, materialService: MaterialService, batchService: BatchService, helperService: HelperService, stockService: StockService, reclassifyInventoryOrderEntity: EntityTarget<T>, reclassifyInventoryOrderItemEntity: EntityTarget<K>);
|
|
19
|
+
constructor(dataSource: DataSource, entities: WmsEntities, materialService: MaterialService, batchService: BatchService, helperService: HelperService, stockService: StockService, reclassifyInventoryOrderEntity: EntityTarget<T>, reclassifyInventoryOrderItemEntity: EntityTarget<K>);
|
|
18
20
|
reclassify(options: ReclassifyInventoryOrderInput): Promise<T>;
|
|
19
21
|
}
|
|
@@ -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 ReclassifyInventoryOrderService = class ReclassifyInventoryOrderService {
|
|
59
63
|
dataSource;
|
|
64
|
+
entities;
|
|
60
65
|
materialService;
|
|
61
66
|
batchService;
|
|
62
67
|
helperService;
|
|
@@ -64,8 +69,9 @@ let ReclassifyInventoryOrderService = class ReclassifyInventoryOrderService {
|
|
|
64
69
|
reclassifyInventoryOrderEntity;
|
|
65
70
|
reclassifyInventoryOrderItemEntity;
|
|
66
71
|
seqPrefix = 'RCO';
|
|
67
|
-
constructor(dataSource, materialService, batchService, helperService, stockService, reclassifyInventoryOrderEntity, reclassifyInventoryOrderItemEntity) {
|
|
72
|
+
constructor(dataSource, entities, materialService, batchService, helperService, stockService, reclassifyInventoryOrderEntity, reclassifyInventoryOrderItemEntity) {
|
|
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 ReclassifyInventoryOrderService = class ReclassifyInventoryOrderService {
|
|
|
78
84
|
const reclassifyOrderRepository = manager.getRepository(this.reclassifyInventoryOrderEntity);
|
|
79
85
|
const reclassifyOrderItemRepository = manager.getRepository(this.reclassifyInventoryOrderItemEntity);
|
|
80
86
|
const reclassifyOrderChangeRepository = manager.getRepository(ReclassifyInventoryOrderChangeEntityClass);
|
|
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
|
const materialRepository = manager.getRepository(this.materialService.materialEntity);
|
|
85
91
|
// Ensure new material exists
|
|
86
92
|
const material = await materialRepository.findOneOrFail({
|
|
@@ -169,9 +175,10 @@ let ReclassifyInventoryOrderService = class ReclassifyInventoryOrderService {
|
|
|
169
175
|
};
|
|
170
176
|
ReclassifyInventoryOrderService = __decorate([
|
|
171
177
|
Injectable(),
|
|
172
|
-
__param(
|
|
173
|
-
__param(
|
|
178
|
+
__param(6, Inject(ReclassifyInventoryOrderEntity)),
|
|
179
|
+
__param(7, Inject(ReclassifyInventoryOrderItemEntity)),
|
|
174
180
|
__metadata("design:paramtypes", [DataSource,
|
|
181
|
+
WmsEntities,
|
|
175
182
|
MaterialService,
|
|
176
183
|
BatchService,
|
|
177
184
|
HelperService,
|
|
@@ -4,15 +4,17 @@ import { ScrapeInput } from '../typings/scrape.input';
|
|
|
4
4
|
import { HelperService } from './helper.service';
|
|
5
5
|
import { MaterialService } from './material.service';
|
|
6
6
|
import { StockService } from './stock.service';
|
|
7
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
7
8
|
export declare class ScrapeService<T extends ScrapeOrderEntityClass = ScrapeOrderEntityClass> {
|
|
8
9
|
private readonly dataSource;
|
|
10
|
+
private readonly entities;
|
|
9
11
|
private readonly helperService;
|
|
10
12
|
private readonly materialService;
|
|
11
13
|
private readonly stockService;
|
|
12
14
|
readonly scrapeOrderEntity: EntityTarget<T>;
|
|
13
15
|
readonly stockEntity: EntityTarget<StockEntityClass>;
|
|
14
16
|
private readonly seqPrefix;
|
|
15
|
-
constructor(dataSource: DataSource, helperService: HelperService, materialService: MaterialService, stockService: StockService, scrapeOrderEntity: EntityTarget<T>, stockEntity: EntityTarget<StockEntityClass>);
|
|
17
|
+
constructor(dataSource: DataSource, entities: WmsEntities, helperService: HelperService, materialService: MaterialService, stockService: StockService, scrapeOrderEntity: EntityTarget<T>, stockEntity: EntityTarget<StockEntityClass>);
|
|
16
18
|
private getRepositories;
|
|
17
19
|
scrape(items: ScrapeInput[], manager?: EntityManager): Promise<T>;
|
|
18
20
|
}
|
|
@@ -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,22 +50,26 @@ import '../models/extensions/transfer-customer-order/transfer-customer-order-cha
|
|
|
48
50
|
import { ScrapeOrderEntity } from '../models/extensions/scrape-order/scrape-order.entity.js';
|
|
49
51
|
import { ScrapeOrderItemEntityClass } from '../models/extensions/scrape-order/scrape-order-item.entity.js';
|
|
50
52
|
import { ScrapeOrderChangeEntityClass } from '../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 { HelperService } from './helper.service.js';
|
|
54
58
|
import { MaterialService } from './material.service.js';
|
|
55
59
|
import { StockService } from './stock.service.js';
|
|
56
60
|
|
|
57
61
|
let ScrapeService = class ScrapeService {
|
|
58
62
|
dataSource;
|
|
63
|
+
entities;
|
|
59
64
|
helperService;
|
|
60
65
|
materialService;
|
|
61
66
|
stockService;
|
|
62
67
|
scrapeOrderEntity;
|
|
63
68
|
stockEntity;
|
|
64
69
|
seqPrefix = 'SCR';
|
|
65
|
-
constructor(dataSource, helperService, materialService, stockService, scrapeOrderEntity, stockEntity) {
|
|
70
|
+
constructor(dataSource, entities, helperService, materialService, stockService, scrapeOrderEntity, stockEntity) {
|
|
66
71
|
this.dataSource = dataSource;
|
|
72
|
+
this.entities = entities;
|
|
67
73
|
this.helperService = helperService;
|
|
68
74
|
this.materialService = materialService;
|
|
69
75
|
this.stockService = stockService;
|
|
@@ -75,7 +81,7 @@ let ScrapeService = class ScrapeService {
|
|
|
75
81
|
scrapeOrder: manager.getRepository(this.scrapeOrderEntity),
|
|
76
82
|
scrapeOrderItem: manager.getRepository(ScrapeOrderItemEntityClass),
|
|
77
83
|
scrapeOrderChange: manager.getRepository(ScrapeOrderChangeEntityClass),
|
|
78
|
-
order: manager.getRepository(
|
|
84
|
+
order: manager.getRepository(this.entities.order),
|
|
79
85
|
stock: manager.getRepository(this.stockEntity),
|
|
80
86
|
};
|
|
81
87
|
}
|
|
@@ -128,9 +134,10 @@ let ScrapeService = class ScrapeService {
|
|
|
128
134
|
};
|
|
129
135
|
ScrapeService = __decorate([
|
|
130
136
|
Injectable(),
|
|
131
|
-
__param(
|
|
132
|
-
__param(
|
|
137
|
+
__param(5, Inject(ScrapeOrderEntity)),
|
|
138
|
+
__param(6, Inject(StockEntity)),
|
|
133
139
|
__metadata("design:paramtypes", [DataSource,
|
|
140
|
+
WmsEntities,
|
|
134
141
|
HelperService,
|
|
135
142
|
MaterialService,
|
|
136
143
|
StockService, Object, Object])
|
|
@@ -9,6 +9,7 @@ import { CancelShipInventoryOrderInput } from '../typings/cancel-ship-inventory-
|
|
|
9
9
|
import { MaterialService } from './material.service';
|
|
10
10
|
import { BatchService } from './batch.service';
|
|
11
11
|
import { StockService } from './stock.service';
|
|
12
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
12
13
|
/**
|
|
13
14
|
* Service for managing ship inventory orders and their items
|
|
14
15
|
* Supports dynamic entity injection for customization
|
|
@@ -17,6 +18,7 @@ import { StockService } from './stock.service';
|
|
|
17
18
|
*/
|
|
18
19
|
export declare class ShipInventoryOrderService<T extends ShipInventoryOrderEntityClass = ShipInventoryOrderEntityClass, K extends ShipInventoryOrderItemEntityClass = ShipInventoryOrderItemEntityClass> {
|
|
19
20
|
private readonly dataSource;
|
|
21
|
+
private readonly entities;
|
|
20
22
|
private readonly materialService;
|
|
21
23
|
private readonly batchService;
|
|
22
24
|
private readonly stockService;
|
|
@@ -25,7 +27,7 @@ export declare class ShipInventoryOrderService<T extends ShipInventoryOrderEntit
|
|
|
25
27
|
readonly shipInventoryOrderReferenceEntity: EntityTarget<ShipInventoryOrderReferenceEntityClass>;
|
|
26
28
|
readonly saleOrderEntity: EntityTarget<SaleOrderEntityClass>;
|
|
27
29
|
readonly selectQueryBuilder: (alias: string) => SelectQueryBuilder<T>;
|
|
28
|
-
constructor(dataSource: DataSource, materialService: MaterialService, batchService: BatchService, stockService: StockService, shipInventoryOrderEntity: EntityTarget<T>, shipInventoryOrderItemEntity: EntityTarget<K>, shipInventoryOrderReferenceEntity: EntityTarget<ShipInventoryOrderReferenceEntityClass>, saleOrderEntity: EntityTarget<SaleOrderEntityClass>);
|
|
30
|
+
constructor(dataSource: DataSource, entities: WmsEntities, materialService: MaterialService, batchService: BatchService, stockService: StockService, shipInventoryOrderEntity: EntityTarget<T>, shipInventoryOrderItemEntity: EntityTarget<K>, shipInventoryOrderReferenceEntity: EntityTarget<ShipInventoryOrderReferenceEntityClass>, saleOrderEntity: EntityTarget<SaleOrderEntityClass>);
|
|
29
31
|
private processShipInventoryOrderReferences;
|
|
30
32
|
private processShipInventoryOrderItems;
|
|
31
33
|
createShipInventoryOrder({ manager, ...options }: CreateShipInventoryOrderInput & {
|
|
@@ -4,7 +4,6 @@ import { ShipInventoryOrderEntity } from '../models/extensions/ship-inventory-or
|
|
|
4
4
|
import { ShipInventoryOrderItemEntity } from '../models/extensions/ship-inventory-order/ship-inventory-order-item.entity.js';
|
|
5
5
|
import { DataSource, IsNull, In } from 'typeorm';
|
|
6
6
|
import { ShipInventoryOrderStatus } from '../typings/find-ship-inventory-order.input.js';
|
|
7
|
-
import { OrderEntity } 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 '../models/metadata/loader.entity.js';
|
|
@@ -13,9 +12,11 @@ import '../models/metadata/loader-unit.entity.js';
|
|
|
13
12
|
import '../models/metadata/location.entity.js';
|
|
14
13
|
import '../models/metadata/material.entity.js';
|
|
15
14
|
import '../models/metadata/material-unit.entity.js';
|
|
15
|
+
import '@rytass/wms-base-nestjs-module';
|
|
16
16
|
import { SaleOrderEntity } from '../models/metadata/sale-order.entity.js';
|
|
17
|
-
import
|
|
17
|
+
import '../models/metadata/stock.entity.js';
|
|
18
18
|
import '../models/metadata/unit.entity.js';
|
|
19
|
+
import { WmsEntities } from '../models/wms-entities.js';
|
|
19
20
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-item.entity.js';
|
|
20
21
|
import '../models/extensions/receive-inventory-order/receive-inventory-order.entity.js';
|
|
21
22
|
import '../models/extensions/receive-inventory-order/receive-inventory-order-change.entity.js';
|
|
@@ -51,6 +52,9 @@ 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 { MaterialService } from './material.service.js';
|
|
55
59
|
import { BatchService } from './batch.service.js';
|
|
56
60
|
import { StockService } from './stock.service.js';
|
|
@@ -63,6 +67,7 @@ import { StockService } from './stock.service.js';
|
|
|
63
67
|
*/
|
|
64
68
|
let ShipInventoryOrderService = class ShipInventoryOrderService {
|
|
65
69
|
dataSource;
|
|
70
|
+
entities;
|
|
66
71
|
materialService;
|
|
67
72
|
batchService;
|
|
68
73
|
stockService;
|
|
@@ -71,8 +76,9 @@ let ShipInventoryOrderService = class ShipInventoryOrderService {
|
|
|
71
76
|
shipInventoryOrderReferenceEntity;
|
|
72
77
|
saleOrderEntity;
|
|
73
78
|
selectQueryBuilder;
|
|
74
|
-
constructor(dataSource, materialService, batchService, stockService, shipInventoryOrderEntity, shipInventoryOrderItemEntity, shipInventoryOrderReferenceEntity, saleOrderEntity) {
|
|
79
|
+
constructor(dataSource, entities, materialService, batchService, stockService, shipInventoryOrderEntity, shipInventoryOrderItemEntity, shipInventoryOrderReferenceEntity, saleOrderEntity) {
|
|
75
80
|
this.dataSource = dataSource;
|
|
81
|
+
this.entities = entities;
|
|
76
82
|
this.materialService = materialService;
|
|
77
83
|
this.batchService = batchService;
|
|
78
84
|
this.stockService = stockService;
|
|
@@ -145,8 +151,8 @@ let ShipInventoryOrderService = class ShipInventoryOrderService {
|
|
|
145
151
|
async processShipInventoryOrderItems(items, manager) {
|
|
146
152
|
const shipInventoryOrderItemRepository = manager.getRepository(this.shipInventoryOrderItemEntity);
|
|
147
153
|
const shipInventoryOrderChangeRepository = manager.getRepository(ShipInventoryOrderChangeEntityClass);
|
|
148
|
-
const orderRepository = manager.getRepository(
|
|
149
|
-
const stockRepository = manager.getRepository(
|
|
154
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
155
|
+
const stockRepository = manager.getRepository(this.entities.stock);
|
|
150
156
|
await Promise.all(items.map(async (data) => {
|
|
151
157
|
// Ensure required fields are present
|
|
152
158
|
if (!data.batchId || !data.materialId)
|
|
@@ -197,7 +203,7 @@ let ShipInventoryOrderService = class ShipInventoryOrderService {
|
|
|
197
203
|
}));
|
|
198
204
|
}
|
|
199
205
|
async createShipInventoryOrder({ manager = this.dataSource.manager, ...options }) {
|
|
200
|
-
const orderRepository = manager.getRepository(
|
|
206
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
201
207
|
const shipInventoryOrderRepository = manager.getRepository(this.shipInventoryOrderEntity);
|
|
202
208
|
const shipInventoryOrderReferenceRepository = manager.getRepository(this.shipInventoryOrderReferenceEntity);
|
|
203
209
|
// create base order
|
|
@@ -357,8 +363,8 @@ let ShipInventoryOrderService = class ShipInventoryOrderService {
|
|
|
357
363
|
async cancelShipInternal(options, manager) {
|
|
358
364
|
const changeRepository = manager.getRepository(ShipInventoryOrderChangeEntityClass);
|
|
359
365
|
const itemRepository = manager.getRepository(this.shipInventoryOrderItemEntity);
|
|
360
|
-
const orderRepository = manager.getRepository(
|
|
361
|
-
const stockRepository = manager.getRepository(
|
|
366
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
367
|
+
const stockRepository = manager.getRepository(this.entities.stock);
|
|
362
368
|
const items = await itemRepository.find({
|
|
363
369
|
where: { id: In(options.map((o) => o.itemId)) },
|
|
364
370
|
relations: ['changes'],
|
|
@@ -514,8 +520,8 @@ let ShipInventoryOrderService = class ShipInventoryOrderService {
|
|
|
514
520
|
return this.dataSource.transaction(async (manager) => {
|
|
515
521
|
const changeRepository = manager.getRepository(ShipInventoryOrderChangeEntityClass);
|
|
516
522
|
const itemRepository = manager.getRepository(this.shipInventoryOrderItemEntity);
|
|
517
|
-
const orderRepository = manager.getRepository(
|
|
518
|
-
const stockRepository = manager.getRepository(
|
|
523
|
+
const orderRepository = manager.getRepository(this.entities.order);
|
|
524
|
+
const stockRepository = manager.getRepository(this.entities.stock);
|
|
519
525
|
const items = await itemRepository.find({
|
|
520
526
|
where: { id: In(options.map((option) => option.itemId)) },
|
|
521
527
|
relations: ['changes'],
|
|
@@ -586,11 +592,12 @@ let ShipInventoryOrderService = class ShipInventoryOrderService {
|
|
|
586
592
|
};
|
|
587
593
|
ShipInventoryOrderService = __decorate([
|
|
588
594
|
Injectable(),
|
|
589
|
-
__param(
|
|
590
|
-
__param(
|
|
591
|
-
__param(
|
|
592
|
-
__param(
|
|
595
|
+
__param(5, Inject(ShipInventoryOrderEntity)),
|
|
596
|
+
__param(6, Inject(ShipInventoryOrderItemEntity)),
|
|
597
|
+
__param(7, Inject(ShipInventoryOrderReferenceEntity)),
|
|
598
|
+
__param(8, Inject(SaleOrderEntity)),
|
|
593
599
|
__metadata("design:paramtypes", [DataSource,
|
|
600
|
+
WmsEntities,
|
|
594
601
|
MaterialService,
|
|
595
602
|
BatchService,
|
|
596
603
|
StockService, Object, Object, Object, Object])
|
|
@@ -5,8 +5,10 @@ import { MaterialService } from './material.service';
|
|
|
5
5
|
import { BatchService } from './batch.service';
|
|
6
6
|
import { HelperService } from './helper.service';
|
|
7
7
|
import { StockService } from './stock.service';
|
|
8
|
+
import { WmsEntities } from '../models/wms-entities';
|
|
8
9
|
export declare class SplitBatchOrderService<T extends SplitBatchOrderEntityClass = SplitBatchOrderEntityClass, K extends SplitBatchOrderItemEntityClass = SplitBatchOrderItemEntityClass> {
|
|
9
10
|
private readonly dataSource;
|
|
11
|
+
private readonly entities;
|
|
10
12
|
private readonly materialService;
|
|
11
13
|
private readonly batchService;
|
|
12
14
|
private readonly helperService;
|
|
@@ -14,6 +16,6 @@ export declare class SplitBatchOrderService<T extends SplitBatchOrderEntityClass
|
|
|
14
16
|
readonly splitBatchOrderEntity: EntityTarget<T>;
|
|
15
17
|
readonly splitBatchOrderItemEntity: EntityTarget<K>;
|
|
16
18
|
private readonly seqPrefix;
|
|
17
|
-
constructor(dataSource: DataSource, materialService: MaterialService, batchService: BatchService, helperService: HelperService, stockService: StockService, splitBatchOrderEntity: EntityTarget<T>, splitBatchOrderItemEntity: EntityTarget<K>);
|
|
19
|
+
constructor(dataSource: DataSource, entities: WmsEntities, materialService: MaterialService, batchService: BatchService, helperService: HelperService, stockService: StockService, splitBatchOrderEntity: EntityTarget<T>, splitBatchOrderItemEntity: EntityTarget<K>);
|
|
18
20
|
split(options: SplitBatchInput): Promise<T>;
|
|
19
21
|
}
|