@things-factory/operato-hub 4.3.416 → 4.3.419
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 +2 -1
- package/dist-server/graphql/resolvers/synchronization/index.js.map +1 -1
- package/dist-server/graphql/resolvers/synchronization/sellercraft-initiate-shipment.js +97 -0
- package/dist-server/graphql/resolvers/synchronization/sellercraft-initiate-shipment.js.map +1 -0
- package/dist-server/graphql/types/synchronization/index.js +1 -0
- package/dist-server/graphql/types/synchronization/index.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js +5 -3
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js.map +1 -1
- package/openapi/v1/outbound.yaml +7 -1
- package/package.json +18 -18
- package/server/graphql/resolvers/synchronization/index.ts +2 -0
- package/server/graphql/resolvers/synchronization/sellercraft-initiate-shipment.ts +116 -0
- package/server/graphql/types/synchronization/index.ts +1 -0
- package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts +18 -5
|
@@ -12,6 +12,7 @@ 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
14
|
const retry_create_lmd_parcels_1 = require("./retry-create-lmd-parcels");
|
|
15
|
+
const sellercraft_initiate_shipment_1 = require("./sellercraft-initiate-shipment");
|
|
15
16
|
const sellercraft_pack_marketplace_order_1 = require("./sellercraft-pack-marketplace-order");
|
|
16
17
|
const sync_all_products_to_powrup_1 = require("./sync-all-products-to-powrup");
|
|
17
18
|
const sync_all_products_to_sellercraft_1 = require("./sync-all-products-to-sellercraft");
|
|
@@ -20,5 +21,5 @@ const sync_products_to_account_1 = require("./sync-products-to-account");
|
|
|
20
21
|
const sync_products_to_powrup_1 = require("./sync-products-to-powrup");
|
|
21
22
|
const sync_products_to_sellercraft_1 = require("./sync-products-to-sellercraft");
|
|
22
23
|
exports.Query = Object.assign(Object.assign(Object.assign({}, fetch_sync_products_1.fetchSyncProductsResolver), fetch_sync_purchase_orders_1.fetchSyncPurchaseOrdersResolver), fetch_sync_invoices_1.fetchSyncInvoicesResolver);
|
|
23
|
-
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({}, 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), 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);
|
|
24
|
+
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({}, 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);
|
|
24
25
|
//# 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,6FAA8F;AAC9F,+EAA+E;AAC/E,yFAAyF;AACzF,6EAA8E;AAC9E,yEAA0E;AAC1E,uEAAwE;AACxE,iFAAkF;AAErE,QAAA,KAAK,iDACb,+CAAyB,GACzB,4DAA+B,GAC/B,+CAAyB,EAC7B;AAEY,QAAA,QAAQ,
|
|
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;AAErE,QAAA,KAAK,iDACb,+CAAyB,GACzB,4DAA+B,GAC/B,+CAAyB,EAC7B;AAEY,QAAA,QAAQ,uOAChB,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,EACjC"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sellercraftInitiateShipmentResolver = 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 integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
8
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
9
|
+
exports.sellercraftInitiateShipmentResolver = {
|
|
10
|
+
async sellercraftInitiateShipment(_, {}, context) {
|
|
11
|
+
const maxRTSRetry = 10;
|
|
12
|
+
try {
|
|
13
|
+
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
14
|
+
var _a, _b, _c, _d;
|
|
15
|
+
try {
|
|
16
|
+
let orderPackageQb = tx
|
|
17
|
+
.getRepository(sales_base_1.OrderPackage)
|
|
18
|
+
.createQueryBuilder('opk')
|
|
19
|
+
.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
20
|
+
.innerJoinAndSelect('opk.domain', 'domain')
|
|
21
|
+
.innerJoinAndSelect('opk.bizplace', 'bizplace')
|
|
22
|
+
.innerJoinAndSelect('bizplace.domain', 'bdomain')
|
|
23
|
+
.innerJoinAndSelect('opk.creator', 'creator')
|
|
24
|
+
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
25
|
+
.where(`rg.source = :source`, { source: auth_base_1.ApplicationType.SELLERCRAFT })
|
|
26
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
27
|
+
.andWhere(`rg.status = :status`, {
|
|
28
|
+
status: sales_base_1.ORDER_STATUS.DONE
|
|
29
|
+
})
|
|
30
|
+
.andWhere(`opk.market_rts_call_success ISNULL`)
|
|
31
|
+
.andWhere(`COALESCE(opk.market_rts_call_retry, 0) <= :maxRTSRetry`, { maxRTSRetry: maxRTSRetry })
|
|
32
|
+
.orderBy(`opk.created_at`);
|
|
33
|
+
let orderPackagesWithoutRTS = await orderPackageQb.getMany();
|
|
34
|
+
if ((orderPackagesWithoutRTS === null || orderPackagesWithoutRTS === void 0 ? void 0 : orderPackagesWithoutRTS.length) > 0) {
|
|
35
|
+
for (let i = 0; i < orderPackagesWithoutRTS.length; i++) {
|
|
36
|
+
const orderPackage = orderPackagesWithoutRTS[i];
|
|
37
|
+
const releaseGood = orderPackage.releaseGood;
|
|
38
|
+
const sellercraft = await tx
|
|
39
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
40
|
+
.findOne({ where: { domain: { id: orderPackage.bizplace.domain.id }, status: 'ACTIVE' } });
|
|
41
|
+
if (!sellercraft) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
let sellercraftSetting = sellercraft.sellercraftSetting;
|
|
45
|
+
let disableInitiateOrderShipment = (sellercraftSetting === null || sellercraftSetting === void 0 ? void 0 : sellercraftSetting.disableInitiateOrderShipment) &&
|
|
46
|
+
(sellercraftSetting === null || sellercraftSetting === void 0 ? void 0 : sellercraftSetting.disableInitiateOrderShipment) == 1
|
|
47
|
+
? true
|
|
48
|
+
: false;
|
|
49
|
+
if (!disableInitiateOrderShipment ||
|
|
50
|
+
(releaseGood.lmdOption == true && (orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.trackingNo) == null)) {
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
let orderInformation = {
|
|
54
|
+
accountId: sellercraft.accountId,
|
|
55
|
+
orderId: releaseGood.refNo2,
|
|
56
|
+
packageId: orderPackage.packageId
|
|
57
|
+
};
|
|
58
|
+
if ((_a = orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.releaseGood) === null || _a === void 0 ? void 0 : _a.lmdOption) {
|
|
59
|
+
orderInformation = Object.assign(Object.assign({}, orderInformation), { awb: orderPackage.airwayBill, trackingNo: orderPackage.trackingNo, lmdOption: (_b = orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.releaseGood) === null || _b === void 0 ? void 0 : _b.lmdOption, shipperName: (_d = (_c = orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.releaseGood) === null || _c === void 0 ? void 0 : _c.lastMileDelivery) === null || _d === void 0 ? void 0 : _d.platform });
|
|
60
|
+
}
|
|
61
|
+
performance.mark(`start:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`);
|
|
62
|
+
try {
|
|
63
|
+
await integration_sellercraft_1.SellercraftAPI.initiateShipment(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: null, user: null } } }));
|
|
64
|
+
await tx
|
|
65
|
+
.getRepository(sales_base_1.OrderPackage)
|
|
66
|
+
.update({ id: orderPackage.id }, { marketRtsCallSuccess: new Date() });
|
|
67
|
+
performance.mark(`end:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`);
|
|
68
|
+
}
|
|
69
|
+
catch (error) {
|
|
70
|
+
performance.mark(`end:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`);
|
|
71
|
+
env_1.logger.error(`sellercraftInitiateShipment[InitiateShipment][Order Package ID: ${orderPackage.id}]: ${error}`);
|
|
72
|
+
await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage)
|
|
73
|
+
.createQueryBuilder()
|
|
74
|
+
.update(sales_base_1.OrderPackage)
|
|
75
|
+
.set({ marketRtsCallRetry: () => `coalesce("market_rts_call_retry", 0) + 1` })
|
|
76
|
+
.where('id = :id', { id: orderPackage.id })
|
|
77
|
+
.execute();
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
finally {
|
|
81
|
+
let perf = performance.measure(`sellercraftInitiateShipment: ${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`, `start:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`, `end:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`);
|
|
82
|
+
console.info(perf.toJSON());
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
catch (e) {
|
|
88
|
+
env_1.logger.error(`sellercraftInitiateShipment[InitiateShipment]: ${e}`);
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
catch (e) {
|
|
93
|
+
env_1.logger.error(`sellercraftInitiateShipment[MainError]: ${e}`);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
//# sourceMappingURL=sellercraft-initiate-shipment.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sellercraft-initiate-shipment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sellercraft-initiate-shipment.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ exports.Mutation = `
|
|
|
20
20
|
syncAllProductsToSellercraft: Boolean @transaction
|
|
21
21
|
syncAllProductsToPowrup: Boolean @transaction
|
|
22
22
|
sellercraftPackMarketplaceOrder: Boolean @transaction
|
|
23
|
+
sellercraftInitiateShipment: Boolean @transaction
|
|
23
24
|
powrupPackOrder: Boolean @transaction
|
|
24
25
|
powrupGetTrackingNo: Boolean @transaction
|
|
25
26
|
powrupGetAirwayBill: Boolean @transaction
|
|
@@ -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;;;;;;;;;;;;;;;;;;CAkBrC,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"}
|
|
@@ -11,7 +11,7 @@ const sales_base_1 = require("@things-factory/sales-base");
|
|
|
11
11
|
const middlewares_1 = require("../middlewares");
|
|
12
12
|
const error_util_1 = require("../utils/error-util");
|
|
13
13
|
api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
|
|
14
|
-
var _a, _b;
|
|
14
|
+
var _a, _b, _c, _d, _e, _f;
|
|
15
15
|
try {
|
|
16
16
|
// get contact points for that bizplace
|
|
17
17
|
// optional query parameter filter
|
|
@@ -50,12 +50,14 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
50
50
|
product: {
|
|
51
51
|
sku: orderInventory.product.sku,
|
|
52
52
|
productDetail: {
|
|
53
|
-
refCode: orderInventory.productDetail.refCode ? orderInventory.productDetail.refCode : null
|
|
53
|
+
refCode: orderInventory.productDetail.refCode ? orderInventory.productDetail.refCode : null,
|
|
54
|
+
name: ((_a = orderInventory === null || orderInventory === void 0 ? void 0 : orderInventory.productDetail) === null || _a === void 0 ? void 0 : _a.name) ? (_b = orderInventory === null || orderInventory === void 0 ? void 0 : orderInventory.productDetail) === null || _b === void 0 ? void 0 : _b.name : null
|
|
54
55
|
}
|
|
55
56
|
},
|
|
56
57
|
orderProduct: {
|
|
57
58
|
productBundle: {
|
|
58
|
-
sku: ((
|
|
59
|
+
sku: ((_c = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.productBundle) === null || _c === void 0 ? void 0 : _c.sku) ? (_d = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.productBundle) === null || _d === void 0 ? void 0 : _d.sku : null,
|
|
60
|
+
name: ((_e = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.productBundle) === null || _e === void 0 ? void 0 : _e.name) ? (_f = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.productBundle) === null || _f === void 0 ? void 0 : _f.name : null
|
|
59
61
|
},
|
|
60
62
|
releaseQty: (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.releaseQty) ? orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.releaseQty : null
|
|
61
63
|
},
|
|
@@ -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,qEAA4D;AAC5D,
|
|
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,qEAA4D;AAC5D,2DAGmC;AAEnC,gDAIuB;AACvB,oDAI4B;AAE5B,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,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,IAAI,MAAM,mCAAQ,OAAO,CAAC,KAAK,KAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAE,CAAA;QACpD,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE;YAC/B,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;YACzC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;SAC5B;QAED,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;gBACT,kBAAkB;gBAClB,0BAA0B;gBAC1B,gCAAgC;gBAChC,+BAA+B;gBAC/B,6CAA6C;gBAC7C,eAAe;gBACf,6BAA6B;gBAC7B,eAAe;gBACf,iCAAiC;gBACjC,UAAU;aACX;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,kBAAkB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAE/E,kCAAkC;QAClC,IAAI,gBAAgB,GAAG,EAAE,CAAA;QACzB,KAAK,MAAM,cAAc,IAAI,WAAW,CAAC,gBAAgB,EAAE;YACzD,IAAI,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;YAC9C,MAAM,yBAAyB,GAAG;gBAChC,OAAO,EAAE;oBACP,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG;oBAC/B,aAAa,EAAE;wBACb,OAAO,EAAE,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;wBAC3F,IAAI,EAAE,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,aAAa,0CAAE,IAAI,EAAC,CAAC,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,aAAa,0CAAE,IAAI,CAAC,CAAC,CAAC,IAAI;qBACvF;iBACF;gBACD,YAAY,EAAE;oBACZ,aAAa,EAAE;wBACb,GAAG,EAAE,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,GAAG,EAAC,CAAC,CAAC,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,GAAG,CAAC,CAAC,CAAC,IAAI;wBAC/E,IAAI,EAAE,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,IAAI,EAAC,CAAC,CAAC,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,IAAI,CAAC,CAAC,CAAC,IAAI;qBACnF;oBACD,UAAU,EAAE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,EAAC,CAAC,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,CAAC,CAAC,CAAC,IAAI;iBACvE;gBACD,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,UAAU,EAAE,cAAc,CAAC,UAAU;aACtC,CAAA;YACD,gBAAgB,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;SACjD;QAED,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,aAAa,EAAE;YACpD,MAAM,sBAAsB,GAAG;gBAC7B,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC1D,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAA;gBACrG,CAAC,CAAC;gBACF,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,kBAAkB,EAAE,YAAY,CAAC,kBAAkB;aACpD,CAAA;YACD,aAAa,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;SAC3C;QAED,IAAI,cAAc,GAAoB,EAAE,CAAA;QACxC,cAAc,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,IAAI,CAAC;YACvD,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE;YACtC,SAAS,EAAE;gBACT,kBAAkB;gBAClB,0BAA0B;gBAC1B,gCAAgC;gBAChC,iBAAiB;gBACjB,kBAAkB;gBAClB,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;QAEF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;gBAClD,OAAO;oBACL,EAAE,EAAE,aAAa,CAAC,EAAE;oBACpB,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,EAAE,EAAE,aAAa,CAAC,EAAE;oBACpB,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,aAAa,EAAE,aAAa,CAAC,aAAa;oBAC1C,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,YAAY,EAAE,aAAa,CAAC,YAAY;oBACxC,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;oBAC1G,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;oBAC1G,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,eAAe,EAAE,aAAa,CAAC,eAAe;wBAC5C,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE;wBACpF,CAAC,CAAC,IAAI;oBACR,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;wBAC9C,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC,IAAI,EAAE;wBACtF,CAAC,CAAC,IAAI;oBACR,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;wBACxD,OAAO;4BACL,EAAE,EAAE,EAAE,CAAC,EAAE;4BACT,UAAU,EAAE,EAAE,CAAC,UAAU;4BACzB,eAAe,EAAE,EAAE,CAAC,eAAe;4BACnC,WAAW,EAAE,EAAE,CAAC,WAAW;4BAC3B,WAAW,EAAE,EAAE,CAAC,WAAW;4BAC3B,MAAM,EAAE,EAAE,CAAC,MAAM;4BACjB,OAAO,EAAE;gCACP,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE;gCACjB,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI;gCACrB,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW;gCACnC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG;6BACpB;4BACD,aAAa,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;yBACvF,CAAA;oBACH,CAAC,CAAC;oBAEF,IAAI;oBACJ,wDAAwD;oBACxD,eAAe;oBACf,2BAA2B;oBAC3B,+BAA+B;oBAC/B,6CAA6C;oBAC7C,6BAA6B;oBAC7B,6DAA6D;oBAC7D,QAAQ;oBACR,QAAQ;oBACR,IAAI;iBACL,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QAED,IAAI,WAAW,GAAiB,EAAE,CAAA;QAClC,WAAW,GAAG,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YACjD,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE;SACjC,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACzC,OAAO;oBACL,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,eAAe,UAAU,CAAC,IAAI,EAAE;iBAC5D,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QAED,MAAM,IAAI,GAAG;YACX,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,sBAAsB,EAAE,WAAW,CAAC,sBAAsB;YAC1D,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,QAAQ,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC1E,MAAM,EAAE;gBACN,cAAc,EAAE,WAAW,CAAC,cAAc;aAC3C;YACD,SAAS,EAAE;gBACT,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,WAAW,EAAE,WAAW,CAAC,WAAW;gBACpC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB;YACD,gBAAgB;YAChB,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YAC9D,cAAc,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;YACjE,UAAU,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;SACxD,CAAA;QAED,OAAO,CAAC,IAAI,GAAG;YACb,IAAI;SACL,CAAA;KACF;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,qBAAQ;YAAE,IAAA,4BAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;;YACjD,IAAA,qCAAwB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CACF,CAAA"}
|
package/openapi/v1/outbound.yaml
CHANGED
|
@@ -677,7 +677,10 @@ definitions:
|
|
|
677
677
|
properties:
|
|
678
678
|
refCode:
|
|
679
679
|
type: 'string'
|
|
680
|
-
example: '201020'
|
|
680
|
+
example: '201020'
|
|
681
|
+
name:
|
|
682
|
+
type: 'string'
|
|
683
|
+
example: 'Panadol Actifast'
|
|
681
684
|
orderProduct:
|
|
682
685
|
type: 'object'
|
|
683
686
|
properties:
|
|
@@ -687,6 +690,9 @@ definitions:
|
|
|
687
690
|
sku:
|
|
688
691
|
type: 'string'
|
|
689
692
|
example: 'Bundle 1'
|
|
693
|
+
name:
|
|
694
|
+
type: 'string'
|
|
695
|
+
example: 'Combo 2x Panadol Actifast'
|
|
690
696
|
releaseQty:
|
|
691
697
|
type: 'integer'
|
|
692
698
|
example: '1'
|
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.419",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -60,8 +60,8 @@
|
|
|
60
60
|
"@things-factory/attachment-base": "^4.3.381",
|
|
61
61
|
"@things-factory/auth-base": "^4.3.381",
|
|
62
62
|
"@things-factory/auth-ui": "^4.3.381",
|
|
63
|
-
"@things-factory/biz-base": "^4.3.
|
|
64
|
-
"@things-factory/biz-ui": "^4.3.
|
|
63
|
+
"@things-factory/biz-base": "^4.3.419",
|
|
64
|
+
"@things-factory/biz-ui": "^4.3.419",
|
|
65
65
|
"@things-factory/board-service": "^4.3.381",
|
|
66
66
|
"@things-factory/board-ui": "^4.3.381",
|
|
67
67
|
"@things-factory/code-ui": "^4.3.381",
|
|
@@ -77,22 +77,22 @@
|
|
|
77
77
|
"@things-factory/i18n-base": "^4.3.381",
|
|
78
78
|
"@things-factory/import-ui": "^4.3.381",
|
|
79
79
|
"@things-factory/import-ui-excel": "^4.3.381",
|
|
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.
|
|
80
|
+
"@things-factory/integration-accounting": "^4.3.419",
|
|
81
|
+
"@things-factory/integration-fulfillment": "^4.3.419",
|
|
82
|
+
"@things-factory/integration-lmd": "^4.3.419",
|
|
83
|
+
"@things-factory/integration-marketplace": "^4.3.419",
|
|
84
|
+
"@things-factory/integration-pos": "^4.3.419",
|
|
85
|
+
"@things-factory/integration-powrup": "^4.3.419",
|
|
86
|
+
"@things-factory/integration-sellercraft": "^4.3.419",
|
|
87
|
+
"@things-factory/integration-sftp": "^4.3.419",
|
|
88
88
|
"@things-factory/lite-menu": "^4.3.381",
|
|
89
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
89
|
+
"@things-factory/marketplace-base": "^4.3.419",
|
|
90
90
|
"@things-factory/more-ui": "^4.3.381",
|
|
91
91
|
"@things-factory/notification": "^4.3.381",
|
|
92
92
|
"@things-factory/pdf": "^4.3.381",
|
|
93
|
-
"@things-factory/product-ui": "^4.3.
|
|
93
|
+
"@things-factory/product-ui": "^4.3.419",
|
|
94
94
|
"@things-factory/resource-ui": "^4.3.381",
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
95
|
+
"@things-factory/sales-base": "^4.3.419",
|
|
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",
|
|
@@ -107,9 +107,9 @@
|
|
|
107
107
|
"@things-factory/setting-ui": "^4.3.381",
|
|
108
108
|
"@things-factory/shell": "^4.3.381",
|
|
109
109
|
"@things-factory/system-ui": "^4.3.381",
|
|
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.419",
|
|
111
|
+
"@things-factory/warehouse-base": "^4.3.419",
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.419",
|
|
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": "0deb9f2fde83fd1b0b912eaaeb8694a2fdec270f"
|
|
125
125
|
}
|
|
@@ -9,6 +9,7 @@ import { powrupGetTrackingNoResolver } from './powrup-get-tracking-no'
|
|
|
9
9
|
import { powrupInitiateShipmentResolver } from './powrup-initiate-shipment'
|
|
10
10
|
import { powrupPackOrderResolver } from './powrup-pack-order'
|
|
11
11
|
import { retryCreateLmdParcelsResolver } from './retry-create-lmd-parcels'
|
|
12
|
+
import { sellercraftInitiateShipmentResolver } from './sellercraft-initiate-shipment'
|
|
12
13
|
import { sellercraftPackMarketplaceOrderResolver } from './sellercraft-pack-marketplace-order'
|
|
13
14
|
import { syncAllProductsToPowrupResolver } from './sync-all-products-to-powrup'
|
|
14
15
|
import { syncAllProductsToSellercraftResolver } from './sync-all-products-to-sellercraft'
|
|
@@ -31,6 +32,7 @@ export const Mutation = {
|
|
|
31
32
|
...syncAllProductsToSellercraftResolver,
|
|
32
33
|
...syncAllProductsToPowrupResolver,
|
|
33
34
|
...sellercraftPackMarketplaceOrderResolver,
|
|
35
|
+
...sellercraftInitiateShipmentResolver,
|
|
34
36
|
...createDatShipments,
|
|
35
37
|
...autoUpdateAllMarketplaceProductVariationQuantityResolver,
|
|
36
38
|
...getLmdAwbResolver,
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
import { getConnection, getRepository } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { ApplicationType } from '@things-factory/auth-base'
|
|
4
|
+
import { logger } from '@things-factory/env'
|
|
5
|
+
import { Sellercraft, SellercraftAPI } from '@things-factory/integration-sellercraft'
|
|
6
|
+
import { ORDER_STATUS, OrderPackage } from '@things-factory/sales-base'
|
|
7
|
+
|
|
8
|
+
export const sellercraftInitiateShipmentResolver = {
|
|
9
|
+
async sellercraftInitiateShipment(_: void, {}, context: any): Promise<void> {
|
|
10
|
+
const maxRTSRetry: number = 10
|
|
11
|
+
try {
|
|
12
|
+
await getConnection().transaction(async tx => {
|
|
13
|
+
try {
|
|
14
|
+
let orderPackageQb = tx
|
|
15
|
+
.getRepository(OrderPackage)
|
|
16
|
+
.createQueryBuilder('opk')
|
|
17
|
+
.innerJoinAndSelect('opk.releaseGood', 'rg')
|
|
18
|
+
.innerJoinAndSelect('opk.domain', 'domain')
|
|
19
|
+
.innerJoinAndSelect('opk.bizplace', 'bizplace')
|
|
20
|
+
.innerJoinAndSelect('bizplace.domain', 'bdomain')
|
|
21
|
+
.innerJoinAndSelect('opk.creator', 'creator')
|
|
22
|
+
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
23
|
+
.where(`rg.source = :source`, { source: ApplicationType.SELLERCRAFT })
|
|
24
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
25
|
+
.andWhere(`rg.status = :status`, {
|
|
26
|
+
status: ORDER_STATUS.DONE
|
|
27
|
+
})
|
|
28
|
+
.andWhere(`opk.market_rts_call_success ISNULL`)
|
|
29
|
+
.andWhere(`COALESCE(opk.market_rts_call_retry, 0) <= :maxRTSRetry`, { maxRTSRetry: maxRTSRetry })
|
|
30
|
+
.orderBy(`opk.created_at`)
|
|
31
|
+
|
|
32
|
+
let orderPackagesWithoutRTS: OrderPackage[] = await orderPackageQb.getMany()
|
|
33
|
+
|
|
34
|
+
if (orderPackagesWithoutRTS?.length > 0) {
|
|
35
|
+
for (let i = 0; i < orderPackagesWithoutRTS.length; i++) {
|
|
36
|
+
const orderPackage: OrderPackage = orderPackagesWithoutRTS[i]
|
|
37
|
+
const releaseGood = orderPackage.releaseGood
|
|
38
|
+
|
|
39
|
+
const sellercraft: Sellercraft = await tx
|
|
40
|
+
.getRepository(Sellercraft)
|
|
41
|
+
.findOne({ where: { domain: { id: orderPackage.bizplace.domain.id }, status: 'ACTIVE' } })
|
|
42
|
+
|
|
43
|
+
if (!sellercraft) {
|
|
44
|
+
continue
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
let sellercraftSetting: any = sellercraft.sellercraftSetting
|
|
48
|
+
let disableInitiateOrderShipment: boolean =
|
|
49
|
+
sellercraftSetting?.disableInitiateOrderShipment &&
|
|
50
|
+
sellercraftSetting?.disableInitiateOrderShipment == 1
|
|
51
|
+
? true
|
|
52
|
+
: false
|
|
53
|
+
|
|
54
|
+
if (
|
|
55
|
+
!disableInitiateOrderShipment ||
|
|
56
|
+
(releaseGood.lmdOption == true && orderPackage?.trackingNo == null)
|
|
57
|
+
) {
|
|
58
|
+
continue
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
let orderInformation: any = {
|
|
62
|
+
accountId: sellercraft.accountId,
|
|
63
|
+
orderId: releaseGood.refNo2,
|
|
64
|
+
packageId: orderPackage.packageId
|
|
65
|
+
}
|
|
66
|
+
if (orderPackage?.releaseGood?.lmdOption) {
|
|
67
|
+
orderInformation = {
|
|
68
|
+
...orderInformation,
|
|
69
|
+
awb: orderPackage.airwayBill,
|
|
70
|
+
trackingNo: orderPackage.trackingNo,
|
|
71
|
+
lmdOption: orderPackage?.releaseGood?.lmdOption,
|
|
72
|
+
shipperName: orderPackage?.releaseGood?.lastMileDelivery?.platform
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
performance.mark(`start:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`)
|
|
77
|
+
try {
|
|
78
|
+
await SellercraftAPI.initiateShipment(sellercraft, {
|
|
79
|
+
...orderInformation,
|
|
80
|
+
context: { state: { domain: null, user: null } }
|
|
81
|
+
})
|
|
82
|
+
await tx
|
|
83
|
+
.getRepository(OrderPackage)
|
|
84
|
+
.update({ id: orderPackage.id }, { marketRtsCallSuccess: new Date() })
|
|
85
|
+
performance.mark(`end:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`)
|
|
86
|
+
} catch (error) {
|
|
87
|
+
performance.mark(`end:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`)
|
|
88
|
+
logger.error(
|
|
89
|
+
`sellercraftInitiateShipment[InitiateShipment][Order Package ID: ${orderPackage.id}]: ${error}`
|
|
90
|
+
)
|
|
91
|
+
await getRepository(OrderPackage)
|
|
92
|
+
.createQueryBuilder()
|
|
93
|
+
.update(OrderPackage)
|
|
94
|
+
.set({ marketRtsCallRetry: () => `coalesce("market_rts_call_retry", 0) + 1` })
|
|
95
|
+
.where('id = :id', { id: orderPackage.id })
|
|
96
|
+
.execute()
|
|
97
|
+
continue
|
|
98
|
+
} finally {
|
|
99
|
+
let perf = performance.measure(
|
|
100
|
+
`sellercraftInitiateShipment: ${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`,
|
|
101
|
+
`start:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`,
|
|
102
|
+
`end:${orderPackage.releaseGood.refNo2} - ${orderPackage.packageId}`
|
|
103
|
+
)
|
|
104
|
+
console.info(perf.toJSON())
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
} catch (e) {
|
|
109
|
+
logger.error(`sellercraftInitiateShipment[InitiateShipment]: ${e}`)
|
|
110
|
+
}
|
|
111
|
+
})
|
|
112
|
+
} catch (e) {
|
|
113
|
+
logger.error(`sellercraftInitiateShipment[MainError]: ${e}`)
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
@@ -19,6 +19,7 @@ export const Mutation = /* GraphQL */ `
|
|
|
19
19
|
syncAllProductsToSellercraft: Boolean @transaction
|
|
20
20
|
syncAllProductsToPowrup: Boolean @transaction
|
|
21
21
|
sellercraftPackMarketplaceOrder: Boolean @transaction
|
|
22
|
+
sellercraftInitiateShipment: Boolean @transaction
|
|
22
23
|
powrupPackOrder: Boolean @transaction
|
|
23
24
|
powrupGetTrackingNo: Boolean @transaction
|
|
24
25
|
powrupGetAirwayBill: Boolean @transaction
|
|
@@ -3,10 +3,21 @@ import { getRepository } from 'typeorm'
|
|
|
3
3
|
|
|
4
4
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
5
5
|
import { Attachment } from '@things-factory/attachment-base'
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
DeliveryOrder,
|
|
8
|
+
ReleaseGood
|
|
9
|
+
} from '@things-factory/sales-base'
|
|
7
10
|
|
|
8
|
-
import {
|
|
9
|
-
|
|
11
|
+
import {
|
|
12
|
+
businessMiddleware,
|
|
13
|
+
loggingMiddleware,
|
|
14
|
+
validationMiddleware
|
|
15
|
+
} from '../middlewares'
|
|
16
|
+
import {
|
|
17
|
+
ApiError,
|
|
18
|
+
ApiErrorHandler,
|
|
19
|
+
throwInternalServerError
|
|
20
|
+
} from '../utils/error-util'
|
|
10
21
|
|
|
11
22
|
router.get(
|
|
12
23
|
'/v1/warehouse/get-release-order-details',
|
|
@@ -55,12 +66,14 @@ router.get(
|
|
|
55
66
|
product: {
|
|
56
67
|
sku: orderInventory.product.sku,
|
|
57
68
|
productDetail: {
|
|
58
|
-
refCode: orderInventory.productDetail.refCode ? orderInventory.productDetail.refCode : null
|
|
69
|
+
refCode: orderInventory.productDetail.refCode ? orderInventory.productDetail.refCode : null,
|
|
70
|
+
name: orderInventory?.productDetail?.name ? orderInventory?.productDetail?.name : null
|
|
59
71
|
}
|
|
60
72
|
},
|
|
61
73
|
orderProduct: {
|
|
62
74
|
productBundle: {
|
|
63
|
-
sku: orderProduct?.productBundle?.sku ? orderProduct?.productBundle?.sku : null
|
|
75
|
+
sku: orderProduct?.productBundle?.sku ? orderProduct?.productBundle?.sku : null,
|
|
76
|
+
name: orderProduct?.productBundle?.name ? orderProduct?.productBundle?.name : null
|
|
64
77
|
},
|
|
65
78
|
releaseQty: orderProduct?.releaseQty ? orderProduct?.releaseQty : null
|
|
66
79
|
},
|