@things-factory/operato-hub 4.3.517 → 4.3.518
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/index.js +4 -2
- package/dist-server/graphql/resolvers/synchronization/index.js.map +1 -1
- package/dist-server/graphql/resolvers/synchronization/webspert-initiate-shipment.js +37 -0
- package/dist-server/graphql/resolvers/synchronization/webspert-initiate-shipment.js.map +1 -0
- package/dist-server/graphql/resolvers/synchronization/webspert-pack-and-get.js +66 -0
- package/dist-server/graphql/resolvers/synchronization/webspert-pack-and-get.js.map +1 -0
- package/dist-server/graphql/types/synchronization/index.js +2 -0
- package/dist-server/graphql/types/synchronization/index.js.map +1 -1
- package/package.json +31 -31
- package/server/graphql/resolvers/synchronization/index.ts +6 -2
- package/server/graphql/resolvers/synchronization/webspert-initiate-shipment.ts +36 -0
- package/server/graphql/resolvers/synchronization/webspert-pack-and-get.ts +73 -0
- package/server/graphql/types/synchronization/index.ts +2 -0
|
@@ -11,6 +11,7 @@ const powrup_get_airway_bill_1 = require("./powrup-get-airway-bill");
|
|
|
11
11
|
const powrup_get_tracking_no_1 = require("./powrup-get-tracking-no");
|
|
12
12
|
const powrup_initiate_shipment_1 = require("./powrup-initiate-shipment");
|
|
13
13
|
const powrup_pack_order_1 = require("./powrup-pack-order");
|
|
14
|
+
const refresh_lmd_access_token_1 = require("./refresh-lmd-access-token");
|
|
14
15
|
const retry_create_lmd_parcels_1 = require("./retry-create-lmd-parcels");
|
|
15
16
|
const sellercraft_initiate_shipment_1 = require("./sellercraft-initiate-shipment");
|
|
16
17
|
const sellercraft_pack_marketplace_order_1 = require("./sellercraft-pack-marketplace-order");
|
|
@@ -20,7 +21,8 @@ const sync_products_from_account_1 = require("./sync-products-from-account");
|
|
|
20
21
|
const sync_products_to_account_1 = require("./sync-products-to-account");
|
|
21
22
|
const sync_products_to_powrup_1 = require("./sync-products-to-powrup");
|
|
22
23
|
const sync_products_to_sellercraft_1 = require("./sync-products-to-sellercraft");
|
|
23
|
-
const
|
|
24
|
+
const webspert_initiate_shipment_1 = require("./webspert-initiate-shipment");
|
|
25
|
+
const webspert_pack_and_get_1 = require("./webspert-pack-and-get");
|
|
24
26
|
exports.Query = Object.assign(Object.assign(Object.assign({}, fetch_sync_products_1.fetchSyncProductsResolver), fetch_sync_purchase_orders_1.fetchSyncPurchaseOrdersResolver), fetch_sync_invoices_1.fetchSyncInvoicesResolver);
|
|
25
|
-
exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, sync_products_to_sellercraft_1.syncProductsToSellercraftResolver), sync_products_to_powrup_1.syncProductsToPowrupResolver), sync_products_from_account_1.syncProductsFromAccountResolver), sync_products_to_account_1.syncProductsToAccountResolver), sync_all_products_to_sellercraft_1.syncAllProductsToSellercraftResolver), sync_all_products_to_powrup_1.syncAllProductsToPowrupResolver), sellercraft_pack_marketplace_order_1.sellercraftPackMarketplaceOrderResolver), sellercraft_initiate_shipment_1.sellercraftInitiateShipmentResolver), create_dat_shipments_1.createDatShipments), auto_update_all_marketplace_product_variation_quantity_1.autoUpdateAllMarketplaceProductVariationQuantityResolver), get_lmd_awb_1.getLmdAwbResolver), powrup_pack_order_1.powrupPackOrderResolver), powrup_get_tracking_no_1.powrupGetTrackingNoResolver), powrup_get_airway_bill_1.powrupGetAirwayBillResolver), powrup_initiate_shipment_1.powrupInitiateShipmentResolver), retry_create_lmd_parcels_1.retryCreateLmdParcelsResolver), refresh_lmd_access_token_1.refreshLmdAccessTokenResolver);
|
|
27
|
+
exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, sync_products_to_sellercraft_1.syncProductsToSellercraftResolver), sync_products_to_powrup_1.syncProductsToPowrupResolver), sync_products_from_account_1.syncProductsFromAccountResolver), sync_products_to_account_1.syncProductsToAccountResolver), sync_all_products_to_sellercraft_1.syncAllProductsToSellercraftResolver), sync_all_products_to_powrup_1.syncAllProductsToPowrupResolver), sellercraft_pack_marketplace_order_1.sellercraftPackMarketplaceOrderResolver), sellercraft_initiate_shipment_1.sellercraftInitiateShipmentResolver), create_dat_shipments_1.createDatShipments), auto_update_all_marketplace_product_variation_quantity_1.autoUpdateAllMarketplaceProductVariationQuantityResolver), get_lmd_awb_1.getLmdAwbResolver), powrup_pack_order_1.powrupPackOrderResolver), powrup_get_tracking_no_1.powrupGetTrackingNoResolver), powrup_get_airway_bill_1.powrupGetAirwayBillResolver), powrup_initiate_shipment_1.powrupInitiateShipmentResolver), retry_create_lmd_parcels_1.retryCreateLmdParcelsResolver), refresh_lmd_access_token_1.refreshLmdAccessTokenResolver), webspert_pack_and_get_1.webspertPackAndGetResolver), webspert_initiate_shipment_1.webspertInitiateShipmentResolver);
|
|
26
28
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/index.ts"],"names":[],"mappings":";;;AAAA,qIAAmI;AACnI,iEAA2D;AAC3D,+DAAiE;AACjE,+DAAiE;AACjE,6EAA8E;AAC9E,+CAAiD;AACjD,qEAAsE;AACtE,qEAAsE;AACtE,yEAA2E;AAC3E,2DAA6D;AAC7D,yEAA0E;AAC1E,mFAAqF;AACrF,6FAA8F;AAC9F,+EAA+E;AAC/E,yFAAyF;AACzF,6EAA8E;AAC9E,yEAA0E;AAC1E,uEAAwE;AACxE,iFAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/index.ts"],"names":[],"mappings":";;;AAAA,qIAAmI;AACnI,iEAA2D;AAC3D,+DAAiE;AACjE,+DAAiE;AACjE,6EAA8E;AAC9E,+CAAiD;AACjD,qEAAsE;AACtE,qEAAsE;AACtE,yEAA2E;AAC3E,2DAA6D;AAC7D,yEAA0E;AAC1E,yEAA0E;AAC1E,mFAAqF;AACrF,6FAA8F;AAC9F,+EAA+E;AAC/E,yFAAyF;AACzF,6EAA8E;AAC9E,yEAA0E;AAC1E,uEAAwE;AACxE,iFAAkF;AAClF,6EAA+E;AAC/E,mEAAoE;AAEvD,QAAA,KAAK,iDACb,+CAAyB,GACzB,4DAA+B,GAC/B,+CAAyB,EAC7B;AAEY,QAAA,QAAQ,iRAChB,gEAAiC,GACjC,sDAA4B,GAC5B,4DAA+B,GAC/B,wDAA6B,GAC7B,uEAAoC,GACpC,6DAA+B,GAC/B,4EAAuC,GACvC,mEAAmC,GACnC,yCAAkB,GAClB,iHAAwD,GACxD,+BAAiB,GACjB,2CAAuB,GACvB,oDAA2B,GAC3B,oDAA2B,GAC3B,yDAA8B,GAC9B,wDAA6B,GAC7B,wDAA6B,GAC7B,kDAA0B,GAC1B,6DAAgC,EACpC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.webspertInitiateShipmentResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
6
|
+
const env_1 = require("@things-factory/env");
|
|
7
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
|
+
exports.webspertInitiateShipmentResolver = {
|
|
9
|
+
async webspertInitiateShipment(_, {}, context) {
|
|
10
|
+
const maxRTSRetry = 10;
|
|
11
|
+
try {
|
|
12
|
+
let orderPackageQb = (0, typeorm_1.getRepository)(sales_base_1.OrderPackage)
|
|
13
|
+
.createQueryBuilder('opk')
|
|
14
|
+
.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
15
|
+
.innerJoinAndSelect('opk.domain', 'domain')
|
|
16
|
+
.innerJoinAndSelect('opk.bizplace', 'bizplace')
|
|
17
|
+
.leftJoinAndSelect('opk.creator', 'creator')
|
|
18
|
+
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
19
|
+
.where(`rg.source = :source`, { source: auth_base_1.ApplicationType.WEBSPERT })
|
|
20
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
21
|
+
.andWhere(`rg.status = :status`, {
|
|
22
|
+
status: sales_base_1.ORDER_STATUS.DONE
|
|
23
|
+
})
|
|
24
|
+
.andWhere(`opk.market_rts_call_success ISNULL`)
|
|
25
|
+
.andWhere(`COALESCE(opk.market_rts_call_retry, 0) <= :maxRTSRetry`, { maxRTSRetry: maxRTSRetry })
|
|
26
|
+
.orderBy(`opk.created_at`);
|
|
27
|
+
let orderPackagesWithoutRTS = await orderPackageQb.getMany();
|
|
28
|
+
if ((orderPackagesWithoutRTS === null || orderPackagesWithoutRTS === void 0 ? void 0 : orderPackagesWithoutRTS.length) > 0) {
|
|
29
|
+
sales_base_1.WebspertController.initiateShipment(null, orderPackagesWithoutRTS, undefined, undefined);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
catch (e) {
|
|
33
|
+
env_1.logger.error(`webspertInitiateShipment[InitiateShipment]: ${e}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
//# sourceMappingURL=webspert-initiate-shipment.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webspert-initiate-shipment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/webspert-initiate-shipment.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,yDAA2D;AAC3D,6CAA4C;AAC5C,2DAA2F;AAE9E,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAO,EAAE,EAAE,EAAE,OAAY;QACtD,MAAM,WAAW,GAAW,EAAE,CAAA;QAC9B,IAAI;YACF,IAAI,cAAc,GAAG,IAAA,uBAAa,EAAC,yBAAY,CAAC;iBAC7C,kBAAkB,CAAC,KAAK,CAAC;iBACzB,kBAAkB,CAAC,iBAAiB,EAAE,IAAI,CAAC;iBAC3C,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC;iBAC1C,kBAAkB,CAAC,cAAc,EAAE,UAAU,CAAC;iBAC9C,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC;iBAC3C,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;iBAC/C,KAAK,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,2BAAe,CAAC,QAAQ,EAAE,CAAC;iBAClE,QAAQ,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;iBAChD,QAAQ,CAAC,qBAAqB,EAAE;gBAC/B,MAAM,EAAE,yBAAY,CAAC,IAAI;aAC1B,CAAC;iBACD,QAAQ,CAAC,oCAAoC,CAAC;iBAC9C,QAAQ,CAAC,wDAAwD,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;iBAChG,OAAO,CAAC,gBAAgB,CAAC,CAAA;YAE5B,IAAI,uBAAuB,GAAmB,MAAM,cAAc,CAAC,OAAO,EAAE,CAAA;YAE5E,IAAI,CAAA,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,MAAM,IAAG,CAAC,EAAE;gBACvC,+BAAkB,CAAC,gBAAgB,CAAC,IAAI,EAAE,uBAAuB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;aACzF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,YAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,EAAE,CAAC,CAAA;SACjE;IACH,CAAC;CACF,CAAA"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.webspertPackAndGetResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
6
|
+
const env_1 = require("@things-factory/env");
|
|
7
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
|
+
const worksheet_base_1 = require("@things-factory/worksheet-base");
|
|
9
|
+
const { PerformanceObserver, performance } = require('node:perf_hooks');
|
|
10
|
+
exports.webspertPackAndGetResolver = {
|
|
11
|
+
async webspertPackAndGet(_, {}, context) {
|
|
12
|
+
try {
|
|
13
|
+
let releaseGoodQb = (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood)
|
|
14
|
+
.createQueryBuilder('rg')
|
|
15
|
+
.innerJoinAndSelect('rg.domain', 'domain')
|
|
16
|
+
.innerJoinAndSelect('rg.bizplace', 'bizplace')
|
|
17
|
+
.innerJoinAndSelect('rg.creator', 'creator')
|
|
18
|
+
.where(`rg.source = :source`, { source: auth_base_1.ApplicationType.WEBSPERT })
|
|
19
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
20
|
+
.andWhere(`rg.status NOT IN(:...status) `, {
|
|
21
|
+
status: [sales_base_1.ORDER_STATUS.CANCELLED, sales_base_1.ORDER_STATUS.PENDING_CANCEL, sales_base_1.ORDER_STATUS.DONE]
|
|
22
|
+
})
|
|
23
|
+
.andWhere(qb => {
|
|
24
|
+
const subQuery = qb
|
|
25
|
+
.subQuery()
|
|
26
|
+
.from(worksheet_base_1.Worksheet, 'ws')
|
|
27
|
+
.innerJoin('ws.worksheetDetails', 'wsd')
|
|
28
|
+
.innerJoin('wsd.targetInventory', 'oi')
|
|
29
|
+
.where('rg.id = oi.release_good_id')
|
|
30
|
+
.andWhere('ws.type IN (:...wsType)', { wsType: ['PICKING', 'BATCH_PICKING'] })
|
|
31
|
+
.getQuery();
|
|
32
|
+
return 'EXISTS ' + subQuery;
|
|
33
|
+
})
|
|
34
|
+
.andWhere(qb => {
|
|
35
|
+
const subQuery = qb.subQuery().from(sales_base_1.OrderPackage, 'opk').where('rg.id = opk.release_good_id').getQuery();
|
|
36
|
+
return 'NOT EXISTS ' + subQuery;
|
|
37
|
+
});
|
|
38
|
+
let releaseGoodsWithoutPackageId = await releaseGoodQb.getMany();
|
|
39
|
+
if ((releaseGoodsWithoutPackageId === null || releaseGoodsWithoutPackageId === void 0 ? void 0 : releaseGoodsWithoutPackageId.length) > 0) {
|
|
40
|
+
Promise.all(releaseGoodsWithoutPackageId.map(async (releaseGood) => {
|
|
41
|
+
if ((releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.lastMarketPackCall) &&
|
|
42
|
+
worksheet_base_1.DateTimeDifference.timeDifferenceInSeconds(releaseGood.lastMarketPackCall, new Date()) <= 5) {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
performance.mark(`start:${releaseGood.id}`);
|
|
46
|
+
try {
|
|
47
|
+
sales_base_1.WebspertController.triggerOrderProcesses(releaseGood, releaseGood.domain, releaseGood.creator);
|
|
48
|
+
performance.mark(`end:${releaseGood.id}`);
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
performance.mark(`end:${releaseGood.id}`);
|
|
52
|
+
env_1.logger.error(`webspertPackAndGet[PackAndGet]: ${e}`);
|
|
53
|
+
}
|
|
54
|
+
finally {
|
|
55
|
+
let perf = performance.measure(`webspertPackAndGet: ${releaseGood.id}`, `start:${releaseGood.id}`, `end:${releaseGood.id}`);
|
|
56
|
+
console.info(perf.toJSON());
|
|
57
|
+
}
|
|
58
|
+
}));
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
catch (e) {
|
|
62
|
+
env_1.logger.error(`webspertPackAndGet[ROSearch]: ${e}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
//# sourceMappingURL=webspert-pack-and-get.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webspert-pack-and-get.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/webspert-pack-and-get.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,8 @@ exports.Mutation = `
|
|
|
31
31
|
sendEmails: Boolean @transaction
|
|
32
32
|
retryCreateLmdParcels: Boolean @transaction
|
|
33
33
|
refreshLmdAccessToken: Boolean @transaction
|
|
34
|
+
webspertPackAndGet: Boolean @transaction
|
|
35
|
+
webspertInitiateShipment: Boolean @transaction
|
|
34
36
|
`;
|
|
35
37
|
exports.Types = [
|
|
36
38
|
sync_product_set_1.SyncProductSet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/synchronization/index.ts"],"names":[],"mappings":";;;AAAA,2DAAqD;AACrD,yDAAoE;AACpE,2DAAqD;AACrD,yDAAmD;AACnD,yEAAkE;AAClE,uEAAiF;AAEpE,QAAA,KAAK,GAAiB;;;;CAIlC,CAAA;AAEY,QAAA,QAAQ,GAAiB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/synchronization/index.ts"],"names":[],"mappings":";;;AAAA,2DAAqD;AACrD,yDAAoE;AACpE,2DAAqD;AACrD,yDAAmD;AACnD,yEAAkE;AAClE,uEAAiF;AAEpE,QAAA,KAAK,GAAiB;;;;CAIlC,CAAA;AAEY,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;CAqBrC,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,iCAAc;IACd,mCAAe;IACf,8CAAoB;IACpB,gDAAqB;IACrB,GAAG,+BAAM;IACT,iCAAc;IACd,mCAAe;IACf,GAAG,wBAAM;CACV,CAAA"}
|
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.518",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -55,44 +55,44 @@
|
|
|
55
55
|
"@operato/scene-tab": "^0.1.8",
|
|
56
56
|
"@operato/scene-table": "^0.1.8",
|
|
57
57
|
"@operato/scene-wheel-sorter": "^0.1.8",
|
|
58
|
-
"@things-factory/api": "^4.3.
|
|
58
|
+
"@things-factory/api": "^4.3.518",
|
|
59
59
|
"@things-factory/apptool-ui": "^4.3.434",
|
|
60
|
-
"@things-factory/attachment-base": "^4.3.
|
|
61
|
-
"@things-factory/auth-base": "^4.3.
|
|
62
|
-
"@things-factory/auth-ui": "^4.3.
|
|
63
|
-
"@things-factory/biz-base": "^4.3.
|
|
64
|
-
"@things-factory/biz-ui": "^4.3.
|
|
65
|
-
"@things-factory/board-service": "^4.3.
|
|
66
|
-
"@things-factory/board-ui": "^4.3.
|
|
67
|
-
"@things-factory/code-ui": "^4.3.
|
|
60
|
+
"@things-factory/attachment-base": "^4.3.518",
|
|
61
|
+
"@things-factory/auth-base": "^4.3.518",
|
|
62
|
+
"@things-factory/auth-ui": "^4.3.518",
|
|
63
|
+
"@things-factory/biz-base": "^4.3.518",
|
|
64
|
+
"@things-factory/biz-ui": "^4.3.518",
|
|
65
|
+
"@things-factory/board-service": "^4.3.518",
|
|
66
|
+
"@things-factory/board-ui": "^4.3.518",
|
|
67
|
+
"@things-factory/code-ui": "^4.3.518",
|
|
68
68
|
"@things-factory/component-ui": "^4.3.381",
|
|
69
69
|
"@things-factory/context-ui": "^4.3.434",
|
|
70
|
-
"@things-factory/document-template-ui": "^4.3.
|
|
70
|
+
"@things-factory/document-template-ui": "^4.3.518",
|
|
71
71
|
"@things-factory/export-ui": "^4.3.434",
|
|
72
72
|
"@things-factory/export-ui-csv": "^4.3.434",
|
|
73
73
|
"@things-factory/export-ui-excel": "^4.3.434",
|
|
74
|
-
"@things-factory/geography": "^4.3.
|
|
74
|
+
"@things-factory/geography": "^4.3.518",
|
|
75
75
|
"@things-factory/grist-ui": "^4.3.434",
|
|
76
76
|
"@things-factory/help": "^4.3.434",
|
|
77
77
|
"@things-factory/i18n-base": "^4.3.434",
|
|
78
78
|
"@things-factory/import-ui": "^4.3.434",
|
|
79
79
|
"@things-factory/import-ui-excel": "^4.3.434",
|
|
80
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
81
|
-
"@things-factory/integration-fulfillment": "^4.3.
|
|
82
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
83
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
84
|
-
"@things-factory/integration-pos": "^4.3.
|
|
85
|
-
"@things-factory/integration-powrup": "^4.3.
|
|
86
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
87
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
88
|
-
"@things-factory/lite-menu": "^4.3.
|
|
89
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
80
|
+
"@things-factory/integration-accounting": "^4.3.518",
|
|
81
|
+
"@things-factory/integration-fulfillment": "^4.3.518",
|
|
82
|
+
"@things-factory/integration-lmd": "^4.3.518",
|
|
83
|
+
"@things-factory/integration-marketplace": "^4.3.518",
|
|
84
|
+
"@things-factory/integration-pos": "^4.3.518",
|
|
85
|
+
"@things-factory/integration-powrup": "^4.3.518",
|
|
86
|
+
"@things-factory/integration-sellercraft": "^4.3.518",
|
|
87
|
+
"@things-factory/integration-sftp": "^4.3.518",
|
|
88
|
+
"@things-factory/lite-menu": "^4.3.518",
|
|
89
|
+
"@things-factory/marketplace-base": "^4.3.518",
|
|
90
90
|
"@things-factory/more-ui": "^4.3.434",
|
|
91
|
-
"@things-factory/notification": "^4.3.
|
|
91
|
+
"@things-factory/notification": "^4.3.518",
|
|
92
92
|
"@things-factory/pdf": "^4.3.381",
|
|
93
|
-
"@things-factory/product-ui": "^4.3.
|
|
94
|
-
"@things-factory/resource-ui": "^4.3.
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
93
|
+
"@things-factory/product-ui": "^4.3.518",
|
|
94
|
+
"@things-factory/resource-ui": "^4.3.518",
|
|
95
|
+
"@things-factory/sales-base": "^4.3.518",
|
|
96
96
|
"@things-factory/scene-data-transform": "^4.3.381",
|
|
97
97
|
"@things-factory/scene-excel": "^4.3.381",
|
|
98
98
|
"@things-factory/scene-firebase": "^4.3.381",
|
|
@@ -104,12 +104,12 @@
|
|
|
104
104
|
"@things-factory/scene-mqtt": "^4.3.381",
|
|
105
105
|
"@things-factory/scene-restful": "^4.3.381",
|
|
106
106
|
"@things-factory/scene-visualizer": "^4.3.381",
|
|
107
|
-
"@things-factory/setting-ui": "^4.3.
|
|
107
|
+
"@things-factory/setting-ui": "^4.3.518",
|
|
108
108
|
"@things-factory/shell": "^4.3.434",
|
|
109
109
|
"@things-factory/system-ui": "^4.3.434",
|
|
110
|
-
"@things-factory/transport-base": "^4.3.
|
|
111
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
112
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
110
|
+
"@things-factory/transport-base": "^4.3.518",
|
|
111
|
+
"@things-factory/warehouse-base": "^4.3.518",
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.518",
|
|
113
113
|
"cron-parser": "^4.7.0",
|
|
114
114
|
"koa2-swagger-ui": "^5.0.2",
|
|
115
115
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -122,5 +122,5 @@
|
|
|
122
122
|
"resolutions": {
|
|
123
123
|
"core-js": "^3.16.0"
|
|
124
124
|
},
|
|
125
|
-
"gitHead": "
|
|
125
|
+
"gitHead": "463e272569a16f091b20eb9a99fdd8739fb99939"
|
|
126
126
|
}
|
|
@@ -8,6 +8,7 @@ import { powrupGetAirwayBillResolver } from './powrup-get-airway-bill'
|
|
|
8
8
|
import { powrupGetTrackingNoResolver } from './powrup-get-tracking-no'
|
|
9
9
|
import { powrupInitiateShipmentResolver } from './powrup-initiate-shipment'
|
|
10
10
|
import { powrupPackOrderResolver } from './powrup-pack-order'
|
|
11
|
+
import { refreshLmdAccessTokenResolver } from './refresh-lmd-access-token'
|
|
11
12
|
import { retryCreateLmdParcelsResolver } from './retry-create-lmd-parcels'
|
|
12
13
|
import { sellercraftInitiateShipmentResolver } from './sellercraft-initiate-shipment'
|
|
13
14
|
import { sellercraftPackMarketplaceOrderResolver } from './sellercraft-pack-marketplace-order'
|
|
@@ -17,7 +18,8 @@ import { syncProductsFromAccountResolver } from './sync-products-from-account'
|
|
|
17
18
|
import { syncProductsToAccountResolver } from './sync-products-to-account'
|
|
18
19
|
import { syncProductsToPowrupResolver } from './sync-products-to-powrup'
|
|
19
20
|
import { syncProductsToSellercraftResolver } from './sync-products-to-sellercraft'
|
|
20
|
-
import {
|
|
21
|
+
import { webspertInitiateShipmentResolver } from './webspert-initiate-shipment'
|
|
22
|
+
import { webspertPackAndGetResolver } from './webspert-pack-and-get'
|
|
21
23
|
|
|
22
24
|
export const Query = {
|
|
23
25
|
...fetchSyncProductsResolver,
|
|
@@ -42,5 +44,7 @@ export const Mutation = {
|
|
|
42
44
|
...powrupGetAirwayBillResolver,
|
|
43
45
|
...powrupInitiateShipmentResolver,
|
|
44
46
|
...retryCreateLmdParcelsResolver,
|
|
45
|
-
...refreshLmdAccessTokenResolver
|
|
47
|
+
...refreshLmdAccessTokenResolver,
|
|
48
|
+
...webspertPackAndGetResolver,
|
|
49
|
+
...webspertInitiateShipmentResolver
|
|
46
50
|
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { getRepository } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { ApplicationType } from '@things-factory/auth-base'
|
|
4
|
+
import { logger } from '@things-factory/env'
|
|
5
|
+
import { ORDER_STATUS, OrderPackage, WebspertController } from '@things-factory/sales-base'
|
|
6
|
+
|
|
7
|
+
export const webspertInitiateShipmentResolver = {
|
|
8
|
+
async webspertInitiateShipment(_: void, {}, context: any): Promise<void> {
|
|
9
|
+
const maxRTSRetry: number = 10
|
|
10
|
+
try {
|
|
11
|
+
let orderPackageQb = getRepository(OrderPackage)
|
|
12
|
+
.createQueryBuilder('opk')
|
|
13
|
+
.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
14
|
+
.innerJoinAndSelect('opk.domain', 'domain')
|
|
15
|
+
.innerJoinAndSelect('opk.bizplace', 'bizplace')
|
|
16
|
+
.leftJoinAndSelect('opk.creator', 'creator')
|
|
17
|
+
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
18
|
+
.where(`rg.source = :source`, { source: ApplicationType.WEBSPERT })
|
|
19
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
20
|
+
.andWhere(`rg.status = :status`, {
|
|
21
|
+
status: ORDER_STATUS.DONE
|
|
22
|
+
})
|
|
23
|
+
.andWhere(`opk.market_rts_call_success ISNULL`)
|
|
24
|
+
.andWhere(`COALESCE(opk.market_rts_call_retry, 0) <= :maxRTSRetry`, { maxRTSRetry: maxRTSRetry })
|
|
25
|
+
.orderBy(`opk.created_at`)
|
|
26
|
+
|
|
27
|
+
let orderPackagesWithoutRTS: OrderPackage[] = await orderPackageQb.getMany()
|
|
28
|
+
|
|
29
|
+
if (orderPackagesWithoutRTS?.length > 0) {
|
|
30
|
+
WebspertController.initiateShipment(null, orderPackagesWithoutRTS, undefined, undefined)
|
|
31
|
+
}
|
|
32
|
+
} catch (e) {
|
|
33
|
+
logger.error(`webspertInitiateShipment[InitiateShipment]: ${e}`)
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { getRepository } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { ApplicationType } from '@things-factory/auth-base'
|
|
4
|
+
import { logger } from '@things-factory/env'
|
|
5
|
+
import { ORDER_STATUS, OrderPackage, ReleaseGood, WebspertController } from '@things-factory/sales-base'
|
|
6
|
+
import { DateTimeDifference, Worksheet } from '@things-factory/worksheet-base'
|
|
7
|
+
|
|
8
|
+
const { PerformanceObserver, performance } = require('node:perf_hooks')
|
|
9
|
+
|
|
10
|
+
export const webspertPackAndGetResolver = {
|
|
11
|
+
async webspertPackAndGet(_: void, {}, context: any): Promise<void> {
|
|
12
|
+
try {
|
|
13
|
+
let releaseGoodQb = getRepository(ReleaseGood)
|
|
14
|
+
.createQueryBuilder('rg')
|
|
15
|
+
.innerJoinAndSelect('rg.domain', 'domain')
|
|
16
|
+
.innerJoinAndSelect('rg.bizplace', 'bizplace')
|
|
17
|
+
.innerJoinAndSelect('rg.creator', 'creator')
|
|
18
|
+
.where(`rg.source = :source`, { source: ApplicationType.WEBSPERT })
|
|
19
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
20
|
+
.andWhere(`rg.status NOT IN(:...status) `, {
|
|
21
|
+
status: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
|
|
22
|
+
})
|
|
23
|
+
.andWhere(qb => {
|
|
24
|
+
const subQuery = qb
|
|
25
|
+
.subQuery()
|
|
26
|
+
.from(Worksheet, 'ws')
|
|
27
|
+
.innerJoin('ws.worksheetDetails', 'wsd')
|
|
28
|
+
.innerJoin('wsd.targetInventory', 'oi')
|
|
29
|
+
.where('rg.id = oi.release_good_id')
|
|
30
|
+
.andWhere('ws.type IN (:...wsType)', { wsType: ['PICKING', 'BATCH_PICKING'] })
|
|
31
|
+
.getQuery()
|
|
32
|
+
return 'EXISTS ' + subQuery
|
|
33
|
+
})
|
|
34
|
+
.andWhere(qb => {
|
|
35
|
+
const subQuery = qb.subQuery().from(OrderPackage, 'opk').where('rg.id = opk.release_good_id').getQuery()
|
|
36
|
+
return 'NOT EXISTS ' + subQuery
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
let releaseGoodsWithoutPackageId: ReleaseGood[] = await releaseGoodQb.getMany()
|
|
40
|
+
|
|
41
|
+
if (releaseGoodsWithoutPackageId?.length > 0) {
|
|
42
|
+
Promise.all(
|
|
43
|
+
releaseGoodsWithoutPackageId.map(async releaseGood => {
|
|
44
|
+
if (
|
|
45
|
+
releaseGood?.lastMarketPackCall &&
|
|
46
|
+
DateTimeDifference.timeDifferenceInSeconds(releaseGood.lastMarketPackCall, new Date()) <= 5
|
|
47
|
+
) {
|
|
48
|
+
return false
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
performance.mark(`start:${releaseGood.id}`)
|
|
52
|
+
try {
|
|
53
|
+
WebspertController.triggerOrderProcesses(releaseGood, releaseGood.domain, releaseGood.creator)
|
|
54
|
+
performance.mark(`end:${releaseGood.id}`)
|
|
55
|
+
} catch (e) {
|
|
56
|
+
performance.mark(`end:${releaseGood.id}`)
|
|
57
|
+
logger.error(`webspertPackAndGet[PackAndGet]: ${e}`)
|
|
58
|
+
} finally {
|
|
59
|
+
let perf = performance.measure(
|
|
60
|
+
`webspertPackAndGet: ${releaseGood.id}`,
|
|
61
|
+
`start:${releaseGood.id}`,
|
|
62
|
+
`end:${releaseGood.id}`
|
|
63
|
+
)
|
|
64
|
+
console.info(perf.toJSON())
|
|
65
|
+
}
|
|
66
|
+
})
|
|
67
|
+
)
|
|
68
|
+
}
|
|
69
|
+
} catch (e) {
|
|
70
|
+
logger.error(`webspertPackAndGet[ROSearch]: ${e}`)
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
@@ -30,6 +30,8 @@ export const Mutation = /* GraphQL */ `
|
|
|
30
30
|
sendEmails: Boolean @transaction
|
|
31
31
|
retryCreateLmdParcels: Boolean @transaction
|
|
32
32
|
refreshLmdAccessToken: Boolean @transaction
|
|
33
|
+
webspertPackAndGet: Boolean @transaction
|
|
34
|
+
webspertInitiateShipment: Boolean @transaction
|
|
33
35
|
`
|
|
34
36
|
|
|
35
37
|
export const Types = [
|