@things-factory/operato-hub 4.3.402 → 4.3.404
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/get-lmd-awb.js +3 -1
- package/dist-server/graphql/resolvers/synchronization/get-lmd-awb.js.map +1 -1
- package/dist-server/graphql/resolvers/synchronization/retry-create-lmd-parcels.js +19 -14
- package/dist-server/graphql/resolvers/synchronization/retry-create-lmd-parcels.js.map +1 -1
- package/package.json +2 -2
- package/server/graphql/resolvers/synchronization/get-lmd-awb.ts +4 -2
- package/server/graphql/resolvers/synchronization/retry-create-lmd-parcels.ts +24 -20
|
@@ -22,7 +22,9 @@ exports.getLmdAwbResolver = {
|
|
|
22
22
|
.andWhere('op.parcel_id IS NOT NULL')
|
|
23
23
|
.andWhere('op.airway_bill IS NULL');
|
|
24
24
|
const orderPackages = await qb.getMany();
|
|
25
|
-
(0,
|
|
25
|
+
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
26
|
+
await (0, worksheet_base_1.processAwbAndTrackingNo)(orderPackages, tx, null, null, null);
|
|
27
|
+
});
|
|
26
28
|
}
|
|
27
29
|
catch (e) {
|
|
28
30
|
env_1.logger.error(`[getLmdAwb]: ${e}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-lmd-awb.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/get-lmd-awb.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"get-lmd-awb.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/get-lmd-awb.ts"],"names":[],"mappings":";;;AAAA,qCAAyF;AAEzF,6CAA4C;AAC5C,2DAAuE;AACvE,mEAAwE;AAE3D,QAAA,iBAAiB,GAAG;IAC/B,KAAK,CAAC,SAAS,CAAC,CAAM,EAAE,EAAE,EAAE,OAAY;QACtC,IAAI;YACF,MAAM,EAAE,GAAqC,IAAA,uBAAa,EAAC,yBAAY,CAAC;iBACrE,kBAAkB,CAAC,IAAI,CAAC;iBACxB,kBAAkB,CAAC,gBAAgB,EAAE,IAAI,CAAC;iBAC1C,kBAAkB,CAAC,WAAW,EAAE,GAAG,CAAC;iBACpC,kBAAkB,CAAC,aAAa,EAAE,GAAG,CAAC;iBACtC,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC;iBACpC,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;iBAC/C,KAAK,CAAC,sBAAsB,CAAC;iBAC7B,QAAQ,CAAC,iCAAiC,EAAE;gBAC3C,QAAQ,EAAE,CAAC,yBAAY,CAAC,SAAS,EAAE,yBAAY,CAAC,cAAc,EAAE,yBAAY,CAAC,IAAI,CAAC;aACnF,CAAC;iBACD,QAAQ,CAAC,0BAA0B,CAAC;iBACpC,QAAQ,CAAC,wBAAwB,CAAC,CAAA;YAErC,MAAM,aAAa,GAAmB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;YAExD,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAiB,EAAE,EAAE;gBAC5D,MAAM,IAAA,wCAAuB,EAAC,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;SACH;QAAC,OAAO,CAAC,EAAE;YACV,YAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;SAClC;IACH,CAAC;CACF,CAAA"}
|
|
@@ -47,21 +47,26 @@ exports.retryCreateLmdParcelsResolver = {
|
|
|
47
47
|
let releaseGoods = await releaseGoodQb.getMany();
|
|
48
48
|
if (releaseGoods === null || releaseGoods === void 0 ? void 0 : releaseGoods.length) {
|
|
49
49
|
for (const releaseGood of releaseGoods) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
50
|
+
try {
|
|
51
|
+
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
52
|
+
let newReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
53
|
+
where: { id: releaseGood.id },
|
|
54
|
+
relations: [
|
|
55
|
+
'domain',
|
|
56
|
+
'lastMileDelivery',
|
|
57
|
+
'orderPackages',
|
|
58
|
+
'orderPackages.orderPackageItems',
|
|
59
|
+
'orderPackages.orderPackageItems.orderProduct',
|
|
60
|
+
'orderPackages.orderPackageItems.orderProduct.product',
|
|
61
|
+
'orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
62
|
+
]
|
|
63
|
+
});
|
|
64
|
+
await (0, worksheet_base_1.createLmdParcel)([newReleaseGood], tx, newReleaseGood.domain, releaseGood.user, releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrder);
|
|
62
65
|
});
|
|
63
|
-
|
|
64
|
-
|
|
66
|
+
}
|
|
67
|
+
catch (e) {
|
|
68
|
+
env_1.logger.error(`retryCreateLmdParcels[releaseGood] releaseGood: ${releaseGood.id}, error: ${e}`);
|
|
69
|
+
}
|
|
65
70
|
}
|
|
66
71
|
}
|
|
67
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-create-lmd-parcels.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/retry-create-lmd-parcels.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,6CAA4C;AAC5C,uEAAmE;AACnE,2DAAoF;AACpF,mEAA2E;AAE9D,QAAA,6BAA6B,GAAG;IAC3C,KAAK,CAAC,qBAAqB,CAAC,CAAO,EAAE,EAAE,EAAE,OAAY;QACnD,IAAI;YACF,IAAI;gBACF,IAAI,aAAa,GAAG,IAAA,uBAAa,EAAC,wBAAW,CAAC;qBAC3C,kBAAkB,CAAC,IAAI,CAAC;qBACxB,kBAAkB,CAAC,qBAAqB,EAAE,KAAK,CAAC;qBAChD,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC;qBACzC,kBAAkB,CAAC,aAAa,EAAE,UAAU,CAAC;qBAC7C,kBAAkB,CAAC,YAAY,EAAE,SAAS,CAAC;qBAC3C,iBAAiB,CAAC,qBAAqB,EAAE,mCAAgB,EAAE,IAAI,EAAE,yBAAyB,CAAC;qBAC3F,KAAK,CAAC,sBAAsB,CAAC;qBAC7B,QAAQ,CAAC,2BAA2B,EAAE;oBACrC,MAAM,EAAE,CAAC,yBAAY,CAAC,OAAO,EAAE,yBAAY,CAAC,aAAa,EAAE,yBAAY,CAAC,OAAO,CAAC;iBACjF,CAAC;qBACD,QAAQ,CAAC,kCAAkC,CAAC;qBAC5C,QAAQ,CAAC,EAAE,CAAC,EAAE;oBACb,MAAM,QAAQ,GAAG,EAAE;yBAChB,QAAQ,EAAE;yBACV,IAAI,CAAC,0BAAS,EAAE,IAAI,CAAC;yBACrB,SAAS,CAAC,qBAAqB,EAAE,KAAK,CAAC;yBACvC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC;yBACtC,KAAK,CAAC,4BAA4B,CAAC;yBACnC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,CAAC;yBAC7E,QAAQ,CAAC,4DAA4D,CAAC;yBACtE,QAAQ,EAAE,CAAA;oBACb,OAAO,SAAS,GAAG,QAAQ,CAAA;gBAC7B,CAAC,CAAC;qBACD,QAAQ,CAAC,EAAE,CAAC,EAAE;oBACb,MAAM,QAAQ,GAAG,EAAE;yBAChB,QAAQ,EAAE;yBACV,IAAI,CAAC,yBAAY,EAAE,KAAK,CAAC;yBACzB,KAAK,CAAC,6BAA6B,CAAC;yBACpC,QAAQ,CAAC,sBAAsB,CAAC;yBAChC,QAAQ,EAAE,CAAA;oBACb,OAAO,SAAS,GAAG,QAAQ,CAAA;gBAC7B,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,CAAC,CAAA;gBAEb,IAAI,YAAY,GAAkB,MAAM,aAAa,CAAC,OAAO,EAAE,CAAA;gBAE/D,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE;oBACxB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;wBACtC,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"retry-create-lmd-parcels.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/retry-create-lmd-parcels.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.404",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -121,5 +121,5 @@
|
|
|
121
121
|
"resolutions": {
|
|
122
122
|
"core-js": "^3.16.0"
|
|
123
123
|
},
|
|
124
|
-
"gitHead": "
|
|
124
|
+
"gitHead": "d477bf49ea191473e8a3383275e92b5ddac41136"
|
|
125
125
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getRepository, SelectQueryBuilder } from 'typeorm'
|
|
1
|
+
import { EntityManager, getConnection, getRepository, SelectQueryBuilder } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { logger } from '@things-factory/env'
|
|
4
4
|
import { ORDER_STATUS, OrderPackage } from '@things-factory/sales-base'
|
|
@@ -23,7 +23,9 @@ export const getLmdAwbResolver = {
|
|
|
23
23
|
|
|
24
24
|
const orderPackages: OrderPackage[] = await qb.getMany()
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
await getConnection().transaction(async (tx: EntityManager) => {
|
|
27
|
+
await processAwbAndTrackingNo(orderPackages, tx, null, null, null)
|
|
28
|
+
})
|
|
27
29
|
} catch (e) {
|
|
28
30
|
logger.error(`[getLmdAwb]: ${e}`)
|
|
29
31
|
}
|
|
@@ -48,27 +48,31 @@ export const retryCreateLmdParcelsResolver = {
|
|
|
48
48
|
|
|
49
49
|
if (releaseGoods?.length) {
|
|
50
50
|
for (const releaseGood of releaseGoods) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
51
|
+
try {
|
|
52
|
+
await getConnection().transaction(async tx => {
|
|
53
|
+
let newReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
54
|
+
where: { id: releaseGood.id },
|
|
55
|
+
relations: [
|
|
56
|
+
'domain',
|
|
57
|
+
'lastMileDelivery',
|
|
58
|
+
'orderPackages',
|
|
59
|
+
'orderPackages.orderPackageItems',
|
|
60
|
+
'orderPackages.orderPackageItems.orderProduct',
|
|
61
|
+
'orderPackages.orderPackageItems.orderProduct.product',
|
|
62
|
+
'orderPackages.orderPackageItems.orderProduct.productDetail'
|
|
63
|
+
]
|
|
64
|
+
})
|
|
65
|
+
await createLmdParcel(
|
|
66
|
+
[newReleaseGood],
|
|
67
|
+
tx,
|
|
68
|
+
newReleaseGood.domain,
|
|
69
|
+
releaseGood.user,
|
|
70
|
+
releaseGood?.marketplaceOrder
|
|
71
|
+
)
|
|
63
72
|
})
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
newReleaseGood.domain,
|
|
68
|
-
releaseGood.user,
|
|
69
|
-
releaseGood?.marketplaceOrder
|
|
70
|
-
)
|
|
71
|
-
})
|
|
73
|
+
} catch (e) {
|
|
74
|
+
logger.error(`retryCreateLmdParcels[releaseGood] releaseGood: ${releaseGood.id}, error: ${e}`)
|
|
75
|
+
}
|
|
72
76
|
}
|
|
73
77
|
}
|
|
74
78
|
} catch (e) {
|