@things-factory/operato-hub 4.3.310 → 4.3.313
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/graphql/resolvers/synchronization/powrup-get-airway-bill.js +9 -1
- package/dist-server/graphql/resolvers/synchronization/powrup-get-airway-bill.js.map +1 -1
- package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js +8 -0
- package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/synchronization/powrup-get-airway-bill.ts +13 -2
- package/server/graphql/resolvers/synchronization/powrup-pack-order.ts +12 -0
|
@@ -6,6 +6,7 @@ const auth_base_1 = require("@things-factory/auth-base");
|
|
|
6
6
|
const env_1 = require("@things-factory/env");
|
|
7
7
|
const integration_powrup_1 = require("@things-factory/integration-powrup");
|
|
8
8
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
9
|
+
const { PerformanceObserver, performance } = require('node:perf_hooks');
|
|
9
10
|
exports.powrupGetAirwayBillResolver = {
|
|
10
11
|
async powrupGetAirwayBill(_, {}, context) {
|
|
11
12
|
try {
|
|
@@ -28,19 +29,21 @@ exports.powrupGetAirwayBillResolver = {
|
|
|
28
29
|
.andWhere(`rg.status NOT IN (:...status) `, {
|
|
29
30
|
status: [sales_base_1.ORDER_STATUS.CANCELLED, sales_base_1.ORDER_STATUS.PENDING_CANCEL, sales_base_1.ORDER_STATUS.DONE]
|
|
30
31
|
})
|
|
31
|
-
.andWhere(`opk.airway_bill
|
|
32
|
+
.andWhere(`opk.airway_bill ISNULL`)
|
|
32
33
|
.orderBy(`rg.created_at`)
|
|
33
34
|
.limit(100);
|
|
34
35
|
let orderPackagesWithoutAirwayBill = await orderPackageQb.getMany();
|
|
35
36
|
if ((orderPackagesWithoutAirwayBill === null || orderPackagesWithoutAirwayBill === void 0 ? void 0 : orderPackagesWithoutAirwayBill.length) > 0) {
|
|
36
37
|
for (let i = 0; i < orderPackagesWithoutAirwayBill.length; i++) {
|
|
37
38
|
const orderPackage = orderPackagesWithoutAirwayBill[i];
|
|
39
|
+
performance.mark(`start:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`);
|
|
38
40
|
try {
|
|
39
41
|
const { trackingNo, transporter, printLabels } = await integration_powrup_1.PowrupAPI.fetchDocument(powrup, {
|
|
40
42
|
context: { state: { domain: null, user: null } },
|
|
41
43
|
refOrderId: orderPackage.releaseGood.refOrderId,
|
|
42
44
|
packageId: orderPackage.packageId
|
|
43
45
|
});
|
|
46
|
+
performance.mark(`end:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`);
|
|
44
47
|
let updateInfo;
|
|
45
48
|
if (printLabels === null || printLabels === void 0 ? void 0 : printLabels.length) {
|
|
46
49
|
printLabels.map(pl => {
|
|
@@ -51,9 +54,14 @@ exports.powrupGetAirwayBillResolver = {
|
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
catch (e) {
|
|
57
|
+
performance.mark(`end:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`);
|
|
54
58
|
env_1.logger.error(`powrupGetAirwayBill[GetAirwayBill][Order Package ID: ${orderPackage.id}]: ${e}`);
|
|
55
59
|
continue;
|
|
56
60
|
}
|
|
61
|
+
finally {
|
|
62
|
+
let perf = performance.measure(`powrupGetAirwayBill: ${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`, `start:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`, `end:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`);
|
|
63
|
+
console.info(perf.toJSON());
|
|
64
|
+
}
|
|
57
65
|
}
|
|
58
66
|
}
|
|
59
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powrup-get-airway-bill.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-get-airway-bill.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,yDAA2D;AAC3D,6CAA4C;AAC5C,2EAAgF;AAChF,2DAAuE;AAE1D,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAO,EAAE,EAAE,EAAE,OAAY;QACjD,IAAI;YACF,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC3C,IAAI;oBACF,MAAM,MAAM,GAAW,MAAM,EAAE;yBAC5B,aAAa,CAAC,2BAAM,CAAC;yBACrB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;oBAElE,IAAI,cAAc,GAAG,MAAM,EAAE;yBAC1B,aAAa,CAAC,yBAAY,CAAC;yBAC3B,kBAAkB,CAAC,KAAK,CAAC;yBACzB,kBAAkB,CAAC,iBAAiB,EAAE,IAAI,CAAC;yBAC3C,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC;yBAC1C,kBAAkB,CAAC,cAAc,EAAE,UAAU,CAAC;yBAC9C,kBAAkB,CAAC,aAAa,EAAE,SAAS,CAAC;yBAC5C,KAAK,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,2BAAe,CAAC,MAAM,EAAE,CAAC;yBAChE,QAAQ,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;yBAChD,QAAQ,CAAC,yBAAyB,CAAC;yBACnC,QAAQ,CAAC,iDAAiD,CAAC;yBAC3D,QAAQ,CAAC,gCAAgC,EAAE;wBAC1C,MAAM,EAAE,CAAC,yBAAY,CAAC,SAAS,EAAE,yBAAY,CAAC,cAAc,EAAE,yBAAY,CAAC,IAAI,CAAC;qBACjF,CAAC;yBACD,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"powrup-get-airway-bill.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-get-airway-bill.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const integration_base_1 = require("@things-factory/integration-base");
|
|
|
8
8
|
const integration_powrup_1 = require("@things-factory/integration-powrup");
|
|
9
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
10
10
|
const worksheet_base_1 = require("@things-factory/worksheet-base");
|
|
11
|
+
const { PerformanceObserver, performance } = require('node:perf_hooks');
|
|
11
12
|
exports.powrupPackOrderResolver = {
|
|
12
13
|
async powrupPackOrder(_, {}, context) {
|
|
13
14
|
try {
|
|
@@ -59,11 +60,13 @@ exports.powrupPackOrderResolver = {
|
|
|
59
60
|
lastMarketPackCall: new Date()
|
|
60
61
|
};
|
|
61
62
|
await (0, typeorm_1.getConnection)().transaction(async (tx2) => {
|
|
63
|
+
performance.mark(`start:${releaseGood.refOrderId}`);
|
|
62
64
|
try {
|
|
63
65
|
const orderPack = await integration_powrup_1.PowrupAPI.packOrder(powrup, {
|
|
64
66
|
context: { state: { domain: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.domain, user: null } },
|
|
65
67
|
refOrderId: releaseGood.refOrderId
|
|
66
68
|
});
|
|
69
|
+
performance.mark(`end:${releaseGood.refOrderId}`);
|
|
67
70
|
(0, integration_base_1.createPayloadLog)(releaseGood.bizplace.id, `/wms/order-pack`, { name: releaseGood.name, refNo: releaseGood.refNo, refOrderId: releaseGood.refOrderId }, JSON.stringify(orderPack), { state: { domain: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.domain, user: null } }, integration_base_1.PayloadType.EGESTION, 'scheduler');
|
|
68
71
|
if (orderPack === null || orderPack === void 0 ? void 0 : orderPack.packages) {
|
|
69
72
|
const packages = orderPack.packages;
|
|
@@ -110,9 +113,14 @@ exports.powrupPackOrderResolver = {
|
|
|
110
113
|
}
|
|
111
114
|
}
|
|
112
115
|
catch (e) {
|
|
116
|
+
performance.mark(`end:${releaseGood.refOrderId}`);
|
|
113
117
|
env_1.logger.error(`powrupPackOrder[PackOrder]: ${e}`);
|
|
114
118
|
await tx2.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true });
|
|
115
119
|
}
|
|
120
|
+
finally {
|
|
121
|
+
let perf = performance.measure(`powrupPackOrder: ${releaseGood.refOrderId}`, `start:${releaseGood.refOrderId}`, `end:${releaseGood.refOrderId}`);
|
|
122
|
+
console.info(perf.toJSON());
|
|
123
|
+
}
|
|
116
124
|
});
|
|
117
125
|
await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, roUpdateFields);
|
|
118
126
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powrup-pack-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-pack-order.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,yDAA2D;AAC3D,6CAA4C;AAC5C,uEAAgF;AAChF,2EAAgF;AAChF,2DAOmC;AACnC,mEAA8E;
|
|
1
|
+
{"version":3,"file":"powrup-pack-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-pack-order.ts"],"names":[],"mappings":"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"}
|
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.313",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"@things-factory/pdf": "^4.3.281",
|
|
93
93
|
"@things-factory/product-ui": "^4.3.301",
|
|
94
94
|
"@things-factory/resource-ui": "^4.3.281",
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
95
|
+
"@things-factory/sales-base": "^4.3.313",
|
|
96
96
|
"@things-factory/scene-data-transform": "^4.3.281",
|
|
97
97
|
"@things-factory/scene-excel": "^4.3.281",
|
|
98
98
|
"@things-factory/scene-firebase": "^4.3.281",
|
|
@@ -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.310",
|
|
111
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
111
|
+
"@things-factory/worksheet-base": "^4.3.313",
|
|
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": "fd59df386439acded1fafc99eeffd0a1c5b2aa49"
|
|
124
124
|
}
|
|
@@ -5,6 +5,8 @@ import { logger } from '@things-factory/env'
|
|
|
5
5
|
import { Platform, Powrup, PowrupAPI } from '@things-factory/integration-powrup'
|
|
6
6
|
import { ORDER_STATUS, OrderPackage } from '@things-factory/sales-base'
|
|
7
7
|
|
|
8
|
+
const { PerformanceObserver, performance } = require('node:perf_hooks')
|
|
9
|
+
|
|
8
10
|
export const powrupGetAirwayBillResolver = {
|
|
9
11
|
async powrupGetAirwayBill(_: void, {}, context: any): Promise<void> {
|
|
10
12
|
try {
|
|
@@ -28,7 +30,7 @@ export const powrupGetAirwayBillResolver = {
|
|
|
28
30
|
.andWhere(`rg.status NOT IN (:...status) `, {
|
|
29
31
|
status: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
|
|
30
32
|
})
|
|
31
|
-
.andWhere(`opk.airway_bill
|
|
33
|
+
.andWhere(`opk.airway_bill ISNULL`)
|
|
32
34
|
.orderBy(`rg.created_at`)
|
|
33
35
|
.limit(100)
|
|
34
36
|
|
|
@@ -37,6 +39,7 @@ export const powrupGetAirwayBillResolver = {
|
|
|
37
39
|
if (orderPackagesWithoutAirwayBill?.length > 0) {
|
|
38
40
|
for (let i = 0; i < orderPackagesWithoutAirwayBill.length; i++) {
|
|
39
41
|
const orderPackage: OrderPackage = orderPackagesWithoutAirwayBill[i]
|
|
42
|
+
performance.mark(`start:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`)
|
|
40
43
|
try {
|
|
41
44
|
const {
|
|
42
45
|
trackingNo,
|
|
@@ -50,7 +53,7 @@ export const powrupGetAirwayBillResolver = {
|
|
|
50
53
|
packageId: orderPackage.packageId
|
|
51
54
|
}
|
|
52
55
|
)
|
|
53
|
-
|
|
56
|
+
performance.mark(`end:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`)
|
|
54
57
|
let updateInfo: any
|
|
55
58
|
if (printLabels?.length) {
|
|
56
59
|
printLabels.map(pl => {
|
|
@@ -66,8 +69,16 @@ export const powrupGetAirwayBillResolver = {
|
|
|
66
69
|
await tx.getRepository(OrderPackage).update({ id: orderPackage.id }, { ...updateInfo })
|
|
67
70
|
}
|
|
68
71
|
} catch (e) {
|
|
72
|
+
performance.mark(`end:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`)
|
|
69
73
|
logger.error(`powrupGetAirwayBill[GetAirwayBill][Order Package ID: ${orderPackage.id}]: ${e}`)
|
|
70
74
|
continue
|
|
75
|
+
} finally {
|
|
76
|
+
let perf = performance.measure(
|
|
77
|
+
`powrupGetAirwayBill: ${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`,
|
|
78
|
+
`start:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`,
|
|
79
|
+
`end:${orderPackage.releaseGood.refOrderId} - ${orderPackage.packageId}`
|
|
80
|
+
)
|
|
81
|
+
console.info(perf.toJSON())
|
|
71
82
|
}
|
|
72
83
|
}
|
|
73
84
|
}
|
|
@@ -14,6 +14,8 @@ import {
|
|
|
14
14
|
} from '@things-factory/sales-base'
|
|
15
15
|
import { DateTimeDifference, Worksheet } from '@things-factory/worksheet-base'
|
|
16
16
|
|
|
17
|
+
const { PerformanceObserver, performance } = require('node:perf_hooks')
|
|
18
|
+
|
|
17
19
|
export const powrupPackOrderResolver = {
|
|
18
20
|
async powrupPackOrder(_: void, {}, context: any): Promise<void> {
|
|
19
21
|
try {
|
|
@@ -73,11 +75,13 @@ export const powrupPackOrderResolver = {
|
|
|
73
75
|
}
|
|
74
76
|
|
|
75
77
|
await getConnection().transaction(async tx2 => {
|
|
78
|
+
performance.mark(`start:${releaseGood.refOrderId}`)
|
|
76
79
|
try {
|
|
77
80
|
const orderPack: any = await PowrupAPI.packOrder(powrup, {
|
|
78
81
|
context: { state: { domain: releaseGood?.domain, user: null } },
|
|
79
82
|
refOrderId: releaseGood.refOrderId
|
|
80
83
|
})
|
|
84
|
+
performance.mark(`end:${releaseGood.refOrderId}`)
|
|
81
85
|
|
|
82
86
|
createPayloadLog(
|
|
83
87
|
releaseGood.bizplace.id,
|
|
@@ -141,8 +145,16 @@ export const powrupPackOrderResolver = {
|
|
|
141
145
|
}
|
|
142
146
|
}
|
|
143
147
|
} catch (e) {
|
|
148
|
+
performance.mark(`end:${releaseGood.refOrderId}`)
|
|
144
149
|
logger.error(`powrupPackOrder[PackOrder]: ${e}`)
|
|
145
150
|
await tx2.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true })
|
|
151
|
+
} finally {
|
|
152
|
+
let perf = performance.measure(
|
|
153
|
+
`powrupPackOrder: ${releaseGood.refOrderId}`,
|
|
154
|
+
`start:${releaseGood.refOrderId}`,
|
|
155
|
+
`end:${releaseGood.refOrderId}`
|
|
156
|
+
)
|
|
157
|
+
console.info(perf.toJSON())
|
|
146
158
|
}
|
|
147
159
|
})
|
|
148
160
|
|