@things-factory/operato-hub 4.3.403 → 4.3.405
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 +0 -2
- package/dist-server/graphql/resolvers/synchronization/retry-create-lmd-parcels.js.map +1 -1
- package/package.json +3 -3
- package/server/graphql/resolvers/synchronization/get-lmd-awb.ts +4 -2
- package/server/graphql/resolvers/synchronization/retry-create-lmd-parcels.ts +0 -1
|
@@ -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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.retryCreateLmdParcelsResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
5
|
const env_1 = require("@things-factory/env");
|
|
6
|
-
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
7
6
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
7
|
const worksheet_base_1 = require("@things-factory/worksheet-base");
|
|
9
8
|
exports.retryCreateLmdParcelsResolver = {
|
|
@@ -16,7 +15,6 @@ exports.retryCreateLmdParcelsResolver = {
|
|
|
16
15
|
.innerJoinAndSelect('rg.domain', 'domain')
|
|
17
16
|
.innerJoinAndSelect('rg.bizplace', 'bizplace')
|
|
18
17
|
.innerJoinAndSelect('rg.creator', 'creator')
|
|
19
|
-
.leftJoinAndMapOne('rg.marketplaceOrder', marketplace_base_1.MarketplaceOrder, 'mo', 'mo.order_no = rg.ref_no')
|
|
20
18
|
.where(`rg.lmd_option = true`)
|
|
21
19
|
.andWhere(`rg.status IN (:...status)`, {
|
|
22
20
|
status: [sales_base_1.ORDER_STATUS.PICKING, sales_base_1.ORDER_STATUS.READY_TO_PACK, sales_base_1.ORDER_STATUS.PACKING]
|
|
@@ -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;
|
|
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.405",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"@things-factory/system-ui": "^4.3.381",
|
|
110
110
|
"@things-factory/transport-base": "^4.3.381",
|
|
111
111
|
"@things-factory/warehouse-base": "^4.3.398",
|
|
112
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.405",
|
|
113
113
|
"cron-parser": "^4.7.0",
|
|
114
114
|
"koa2-swagger-ui": "^5.0.2",
|
|
115
115
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -121,5 +121,5 @@
|
|
|
121
121
|
"resolutions": {
|
|
122
122
|
"core-js": "^3.16.0"
|
|
123
123
|
},
|
|
124
|
-
"gitHead": "
|
|
124
|
+
"gitHead": "48fc2ccaf6183ef6df9dbcd0e8ff861a4f5ba35b"
|
|
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
|
}
|
|
@@ -15,7 +15,6 @@ export const retryCreateLmdParcelsResolver = {
|
|
|
15
15
|
.innerJoinAndSelect('rg.domain', 'domain')
|
|
16
16
|
.innerJoinAndSelect('rg.bizplace', 'bizplace')
|
|
17
17
|
.innerJoinAndSelect('rg.creator', 'creator')
|
|
18
|
-
.leftJoinAndMapOne('rg.marketplaceOrder', MarketplaceOrder, 'mo', 'mo.order_no = rg.ref_no')
|
|
19
18
|
.where(`rg.lmd_option = true`)
|
|
20
19
|
.andWhere(`rg.status IN (:...status)`, {
|
|
21
20
|
status: [ORDER_STATUS.PICKING, ORDER_STATUS.READY_TO_PACK, ORDER_STATUS.PACKING]
|