@things-factory/operato-hub 4.3.282 → 4.3.283
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/routers/api/restful-apis/v1/warehouse/get-release-order-details.js +18 -2
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-list.js +18 -2
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-list.js.map +1 -1
- package/openapi/v1/outbound.yaml +79 -0
- package/package.json +3 -3
- package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts +20 -2
- package/server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts +18 -2
|
@@ -22,7 +22,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
22
22
|
}
|
|
23
23
|
const releaseGood = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({
|
|
24
24
|
where: filter,
|
|
25
|
-
relations: ['orderInventories', 'orderInventories.product']
|
|
25
|
+
relations: ['orderInventories', 'orderInventories.product', 'orderPackages', 'orderPackages.orderPackageItems']
|
|
26
26
|
});
|
|
27
27
|
if (!releaseGood)
|
|
28
28
|
throw new error_util_1.ApiError('E04', `release order: ${filter['name']}`);
|
|
@@ -41,6 +41,21 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
41
41
|
};
|
|
42
42
|
orderInventories.push(orderInventoriesDataPoint);
|
|
43
43
|
}
|
|
44
|
+
let orderPackages = [];
|
|
45
|
+
for (const orderPackage of releaseGood.orderPackages) {
|
|
46
|
+
const orderPackagesDataPoint = {
|
|
47
|
+
orderPackageItems: orderPackage.orderPackageItems.map(opi => {
|
|
48
|
+
return { name: opi.name, status: opi.status, releaseQty: opi.releaseQty, packedQty: opi.packedQty };
|
|
49
|
+
}),
|
|
50
|
+
name: orderPackage.name,
|
|
51
|
+
packageId: orderPackage.packageId,
|
|
52
|
+
transporter: orderPackage.transporter,
|
|
53
|
+
trackingNo: orderPackage.trackingNo,
|
|
54
|
+
status: orderPackage.status,
|
|
55
|
+
dispatchmentStatus: orderPackage.dispatchmentStatus
|
|
56
|
+
};
|
|
57
|
+
orderPackages.push(orderPackagesDataPoint);
|
|
58
|
+
}
|
|
44
59
|
const data = {
|
|
45
60
|
id: releaseGood.id,
|
|
46
61
|
roNo: releaseGood.roNo,
|
|
@@ -86,7 +101,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
86
101
|
phone2: releaseGood.phone2,
|
|
87
102
|
email: releaseGood.email
|
|
88
103
|
},
|
|
89
|
-
orderInventories
|
|
104
|
+
orderInventories,
|
|
105
|
+
orderPackages
|
|
90
106
|
};
|
|
91
107
|
context.body = {
|
|
92
108
|
data
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAuC;AAEvC,6CAAgE;AAChE,2DAAwD;AAExD,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,yCAAyC,EACzC,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,uCAAuC;QACvC,kCAAkC;QAClC,IAAI,MAAM,qBAAQ,OAAO,CAAC,KAAK,CAAE,CAAA;QACjC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;QAC3B,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;SACtB;QAED,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,MAAM;YACb,SAAS,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-list', middlewares_1
|
|
|
28
28
|
delete filter['offset'];
|
|
29
29
|
const [releaseGoods, totalCount] = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findAndCount({
|
|
30
30
|
where: filter,
|
|
31
|
-
relations: ['orderInventories', 'orderInventories.product'],
|
|
31
|
+
relations: ['orderInventories', 'orderInventories.product', 'orderPackages', 'orderPackages.orderPackageItems'],
|
|
32
32
|
skip: offset,
|
|
33
33
|
take: limit,
|
|
34
34
|
order: { createdAt: 'DESC' }
|
|
@@ -50,6 +50,21 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-list', middlewares_1
|
|
|
50
50
|
};
|
|
51
51
|
orderInventories.push(orderInventoriesDataPoint);
|
|
52
52
|
}
|
|
53
|
+
let orderPackages = [];
|
|
54
|
+
for (const orderPackage of releaseGood.orderPackages) {
|
|
55
|
+
const orderPackagesDataPoint = {
|
|
56
|
+
orderPackageItems: orderPackage.orderPackageItems.map(opi => {
|
|
57
|
+
return { name: opi.name, status: opi.status, releaseQty: opi.releaseQty, packedQty: opi.packedQty };
|
|
58
|
+
}),
|
|
59
|
+
name: orderPackage.name,
|
|
60
|
+
packageId: orderPackage.packageId,
|
|
61
|
+
transporter: orderPackage.transporter,
|
|
62
|
+
trackingNo: orderPackage.trackingNo,
|
|
63
|
+
status: orderPackage.status,
|
|
64
|
+
dispatchmentStatus: orderPackage.dispatchmentStatus
|
|
65
|
+
};
|
|
66
|
+
orderPackages.push(orderPackagesDataPoint);
|
|
67
|
+
}
|
|
53
68
|
const datapoint = {
|
|
54
69
|
id: releaseGood.id,
|
|
55
70
|
roNo: releaseGood.roNo,
|
|
@@ -95,7 +110,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-list', middlewares_1
|
|
|
95
110
|
phone2: releaseGood.phone2,
|
|
96
111
|
email: releaseGood.email
|
|
97
112
|
},
|
|
98
|
-
orderInventories
|
|
113
|
+
orderInventories,
|
|
114
|
+
orderPackages
|
|
99
115
|
};
|
|
100
116
|
data.push(datapoint);
|
|
101
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAgD;AAEhD,6CAAgE;AAChE,2DAAwD;AAExD,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,sCAAsC,EACtC,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,uCAAuC;QACvC,kCAAkC;QAClC,IAAI,MAAM,qBAAQ,OAAO,CAAC,KAAK,CAAE,CAAA;QACjC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;QAClD,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;QAC3B,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;SACtB;QACD,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,iBAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAE/C,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;QACvB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAA;QACtB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;QAEvB,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAkB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,YAAY,CAAC;YAC9F,KAAK,EAAE,MAAM;YACb,SAAS,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts"],"names":[],"mappings":"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"}
|
package/openapi/v1/outbound.yaml
CHANGED
|
@@ -439,6 +439,45 @@ definitions:
|
|
|
439
439
|
packingSize:
|
|
440
440
|
type: 'integer'
|
|
441
441
|
example: 24
|
|
442
|
+
orderPackage:
|
|
443
|
+
type: 'array'
|
|
444
|
+
items:
|
|
445
|
+
type: 'object'
|
|
446
|
+
properties:
|
|
447
|
+
name:
|
|
448
|
+
type: 'string'
|
|
449
|
+
example: 'OPK-cba00ee3-7769-4bd1-9ce1-18081d997550'
|
|
450
|
+
packageId:
|
|
451
|
+
type: 'string'
|
|
452
|
+
example: '6213443387667'
|
|
453
|
+
transporter:
|
|
454
|
+
type: 'string'
|
|
455
|
+
example: null
|
|
456
|
+
trackingNo:
|
|
457
|
+
type: 'string'
|
|
458
|
+
example: null
|
|
459
|
+
status:
|
|
460
|
+
type: 'string'
|
|
461
|
+
example: 'PROCESSING'
|
|
462
|
+
dispatchmentStatus:
|
|
463
|
+
type: 'string'
|
|
464
|
+
example: 'READY_TO_DISPATCH'
|
|
465
|
+
orderPackageItems:
|
|
466
|
+
type: 'array'
|
|
467
|
+
items:
|
|
468
|
+
properties:
|
|
469
|
+
name:
|
|
470
|
+
type: 'string'
|
|
471
|
+
example: 'OPKI-61c6def6-e3d2-4da6-9fa1-4916050966b6'
|
|
472
|
+
status:
|
|
473
|
+
type: 'string'
|
|
474
|
+
example: 'PROCESSING'
|
|
475
|
+
releaseQty:
|
|
476
|
+
type: 'integer'
|
|
477
|
+
example: 1
|
|
478
|
+
packedQty:
|
|
479
|
+
types: 'integer'
|
|
480
|
+
example: null
|
|
442
481
|
totalCount:
|
|
443
482
|
type: 'integer'
|
|
444
483
|
example: 35
|
|
@@ -610,6 +649,46 @@ definitions:
|
|
|
610
649
|
packingSize:
|
|
611
650
|
type: 'integer'
|
|
612
651
|
example: 24
|
|
652
|
+
orderPackage:
|
|
653
|
+
type: 'array'
|
|
654
|
+
items:
|
|
655
|
+
type: 'object'
|
|
656
|
+
properties:
|
|
657
|
+
name:
|
|
658
|
+
type: 'string'
|
|
659
|
+
example: 'OPK-cba00ee3-7769-4bd1-9ce1-18081d997550'
|
|
660
|
+
packageId:
|
|
661
|
+
type: 'string'
|
|
662
|
+
example: '6213443387667'
|
|
663
|
+
transporter:
|
|
664
|
+
type: 'string'
|
|
665
|
+
example: null
|
|
666
|
+
trackingNo:
|
|
667
|
+
type: 'string'
|
|
668
|
+
example: null
|
|
669
|
+
status:
|
|
670
|
+
type: 'string'
|
|
671
|
+
example: 'PROCESSING'
|
|
672
|
+
dispatchmentStatus:
|
|
673
|
+
type: 'string'
|
|
674
|
+
example: 'READY_TO_DISPATCH'
|
|
675
|
+
orderPackageItems:
|
|
676
|
+
type: 'array'
|
|
677
|
+
items:
|
|
678
|
+
properties:
|
|
679
|
+
name:
|
|
680
|
+
type: 'string'
|
|
681
|
+
example: 'OPKI-61c6def6-e3d2-4da6-9fa1-4916050966b6'
|
|
682
|
+
status:
|
|
683
|
+
type: 'string'
|
|
684
|
+
example: 'PROCESSING'
|
|
685
|
+
releaseQty:
|
|
686
|
+
type: 'integer'
|
|
687
|
+
example: 1
|
|
688
|
+
packedQty:
|
|
689
|
+
types: 'integer'
|
|
690
|
+
example: null
|
|
691
|
+
|
|
613
692
|
xml:
|
|
614
693
|
name: 'GetReleaseOrderDetails'
|
|
615
694
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.283",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
"@things-factory/shell": "^4.3.281",
|
|
109
109
|
"@things-factory/system-ui": "^4.3.281",
|
|
110
110
|
"@things-factory/warehouse-base": "^4.3.282",
|
|
111
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
111
|
+
"@things-factory/worksheet-base": "^4.3.283",
|
|
112
112
|
"cron-parser": "^4.7.0",
|
|
113
113
|
"koa2-swagger-ui": "^5.0.2",
|
|
114
114
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
"resolutions": {
|
|
121
121
|
"core-js": "^3.16.0"
|
|
122
122
|
},
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "7e49c0e034a5210318cbcb8243519f00a8615329"
|
|
124
124
|
}
|
|
@@ -26,7 +26,7 @@ router.get(
|
|
|
26
26
|
|
|
27
27
|
const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
|
|
28
28
|
where: filter,
|
|
29
|
-
relations: ['orderInventories', 'orderInventories.product']
|
|
29
|
+
relations: ['orderInventories', 'orderInventories.product', 'orderPackages', 'orderPackages.orderPackageItems']
|
|
30
30
|
})
|
|
31
31
|
|
|
32
32
|
if (!releaseGood) throw new ApiError('E04', `release order: ${filter['name']}`)
|
|
@@ -46,6 +46,23 @@ router.get(
|
|
|
46
46
|
}
|
|
47
47
|
orderInventories.push(orderInventoriesDataPoint)
|
|
48
48
|
}
|
|
49
|
+
|
|
50
|
+
let orderPackages = []
|
|
51
|
+
for (const orderPackage of releaseGood.orderPackages) {
|
|
52
|
+
const orderPackagesDataPoint = {
|
|
53
|
+
orderPackageItems: orderPackage.orderPackageItems.map(opi => {
|
|
54
|
+
return { name: opi.name, status: opi.status, releaseQty: opi.releaseQty, packedQty: opi.packedQty }
|
|
55
|
+
}),
|
|
56
|
+
name: orderPackage.name,
|
|
57
|
+
packageId: orderPackage.packageId,
|
|
58
|
+
transporter: orderPackage.transporter,
|
|
59
|
+
trackingNo: orderPackage.trackingNo,
|
|
60
|
+
status: orderPackage.status,
|
|
61
|
+
dispatchmentStatus: orderPackage.dispatchmentStatus
|
|
62
|
+
}
|
|
63
|
+
orderPackages.push(orderPackagesDataPoint)
|
|
64
|
+
}
|
|
65
|
+
|
|
49
66
|
const data = {
|
|
50
67
|
id: releaseGood.id,
|
|
51
68
|
roNo: releaseGood.roNo,
|
|
@@ -91,7 +108,8 @@ router.get(
|
|
|
91
108
|
phone2: releaseGood.phone2,
|
|
92
109
|
email: releaseGood.email
|
|
93
110
|
},
|
|
94
|
-
orderInventories
|
|
111
|
+
orderInventories,
|
|
112
|
+
orderPackages
|
|
95
113
|
}
|
|
96
114
|
|
|
97
115
|
context.body = {
|
|
@@ -33,7 +33,7 @@ router.get(
|
|
|
33
33
|
|
|
34
34
|
const [releaseGoods, totalCount]: ReleaseGood[] = await getRepository(ReleaseGood).findAndCount({
|
|
35
35
|
where: filter,
|
|
36
|
-
relations: ['orderInventories', 'orderInventories.product'],
|
|
36
|
+
relations: ['orderInventories', 'orderInventories.product', 'orderPackages', 'orderPackages.orderPackageItems'],
|
|
37
37
|
skip: offset,
|
|
38
38
|
take: limit,
|
|
39
39
|
order: { createdAt: 'DESC' }
|
|
@@ -56,6 +56,21 @@ router.get(
|
|
|
56
56
|
}
|
|
57
57
|
orderInventories.push(orderInventoriesDataPoint)
|
|
58
58
|
}
|
|
59
|
+
let orderPackages = []
|
|
60
|
+
for (const orderPackage of releaseGood.orderPackages) {
|
|
61
|
+
const orderPackagesDataPoint = {
|
|
62
|
+
orderPackageItems: orderPackage.orderPackageItems.map(opi => {
|
|
63
|
+
return { name: opi.name, status: opi.status, releaseQty: opi.releaseQty, packedQty: opi.packedQty }
|
|
64
|
+
}),
|
|
65
|
+
name: orderPackage.name,
|
|
66
|
+
packageId: orderPackage.packageId,
|
|
67
|
+
transporter: orderPackage.transporter,
|
|
68
|
+
trackingNo: orderPackage.trackingNo,
|
|
69
|
+
status: orderPackage.status,
|
|
70
|
+
dispatchmentStatus: orderPackage.dispatchmentStatus
|
|
71
|
+
}
|
|
72
|
+
orderPackages.push(orderPackagesDataPoint)
|
|
73
|
+
}
|
|
59
74
|
const datapoint = {
|
|
60
75
|
id: releaseGood.id,
|
|
61
76
|
roNo: releaseGood.roNo,
|
|
@@ -101,7 +116,8 @@ router.get(
|
|
|
101
116
|
phone2: releaseGood.phone2,
|
|
102
117
|
email: releaseGood.email
|
|
103
118
|
},
|
|
104
|
-
orderInventories
|
|
119
|
+
orderInventories,
|
|
120
|
+
orderPackages
|
|
105
121
|
}
|
|
106
122
|
data.push(datapoint)
|
|
107
123
|
}
|