@things-factory/worksheet-base 4.3.89 → 4.3.94
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/controllers/ecommerce/ecommerce-controller.js +1 -1
- package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +67 -28
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +30 -7
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +25 -8
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +60 -12
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +51 -25
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +37 -29
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +132 -118
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js +39 -14
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/ecommerce/ecommerce-controller.ts +1 -1
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +77 -33
- package/server/graphql/resolvers/worksheet/packing/activate-packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +34 -9
- package/server/graphql/resolvers/worksheet/packing/packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +28 -9
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +69 -13
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +60 -30
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +46 -40
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +142 -131
- package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts +45 -15
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.activatePicking = exports.activatePickingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
5
|
-
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
6
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
7
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
8
|
const controllers_1 = require("../../../../controllers");
|
|
@@ -16,36 +16,62 @@ async function activatePicking(tx, domain, user, worksheetNo) {
|
|
|
16
16
|
const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
17
17
|
const worksheet = await worksheetController.activatePicking(worksheetNo);
|
|
18
18
|
const companyDomain = worksheet === null || worksheet === void 0 ? void 0 : worksheet.bizplace.company.domain;
|
|
19
|
-
// find for any existing marketplace store connections
|
|
20
|
-
const marketplaceStores = await tx.getRepository(integration_marketplace_1.MarketplaceStore).find({
|
|
21
|
-
where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
|
|
22
|
-
relations: ['marketplaceDistributors']
|
|
23
|
-
});
|
|
24
19
|
let releaseGood = worksheet.releaseGood;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
let orderInventories = worksheetDetails.map(wsd => wsd.targetInventory);
|
|
33
|
-
const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
|
|
34
|
-
await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain);
|
|
35
|
-
}
|
|
36
|
-
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
37
|
-
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
38
|
-
relations: ['marketplaceStore']
|
|
20
|
+
const orderSource = releaseGood.source;
|
|
21
|
+
switch (orderSource) {
|
|
22
|
+
case auth_base_1.ApplicationType.MMS:
|
|
23
|
+
// find for any existing marketplace store connections
|
|
24
|
+
const marketplaceStores = await tx.getRepository(integration_marketplace_1.MarketplaceStore).find({
|
|
25
|
+
where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
|
|
26
|
+
relations: ['marketplaceDistributors']
|
|
39
27
|
});
|
|
40
|
-
if (
|
|
41
|
-
|
|
42
|
-
|
|
28
|
+
if (marketplaceStores === null || marketplaceStores === void 0 ? void 0 : marketplaceStores.length) {
|
|
29
|
+
if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
30
|
+
const worksheetDetails = worksheet.worksheetDetails;
|
|
31
|
+
let orderInventories = worksheetDetails.map(wsd => wsd.targetInventory);
|
|
43
32
|
const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
|
|
44
|
-
await ecommerceCtrl.
|
|
33
|
+
await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain);
|
|
34
|
+
}
|
|
35
|
+
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
36
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
37
|
+
relations: ['marketplaceStore']
|
|
38
|
+
});
|
|
39
|
+
if (marketplaceOrder) {
|
|
40
|
+
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
41
|
+
if (marketplaceStore.isAutoUpdateShipment) {
|
|
42
|
+
const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
|
|
43
|
+
await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PICKING);
|
|
44
|
+
}
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
break;
|
|
48
|
+
default:
|
|
49
|
+
break;
|
|
48
50
|
}
|
|
51
|
+
// if (releaseGood.type === 'b2c') {
|
|
52
|
+
// const sellercraft: Sellercraft = await tx
|
|
53
|
+
// .getRepository(Sellercraft)
|
|
54
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
55
|
+
// if (marketplaceStores?.length && !sellercraft) {
|
|
56
|
+
// if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
57
|
+
// const worksheetDetails = worksheet.worksheetDetails
|
|
58
|
+
// let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
|
|
59
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
60
|
+
// await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
|
|
61
|
+
// }
|
|
62
|
+
// const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
63
|
+
// where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
64
|
+
// relations: ['marketplaceStore']
|
|
65
|
+
// })
|
|
66
|
+
// if (marketplaceOrder) {
|
|
67
|
+
// const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
|
|
68
|
+
// if (marketplaceStore.isAutoUpdateShipment) {
|
|
69
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
70
|
+
// await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
|
|
71
|
+
// }
|
|
72
|
+
// }
|
|
73
|
+
// }
|
|
74
|
+
// }
|
|
49
75
|
return worksheet;
|
|
50
76
|
}
|
|
51
77
|
exports.activatePicking = activatePicking;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completeBatchPicking = exports.completeBatchPickingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
6
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
@@ -27,36 +28,43 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
27
28
|
const targetInventories = worksheetDetails
|
|
28
29
|
.filter(wsd => wsd.status != 'MISSING')
|
|
29
30
|
.map((wsd) => wsd.targetInventory);
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
for (const releaseGood of releaseGoods) {
|
|
38
|
-
if (!map.has(releaseGood.id)) {
|
|
39
|
-
map.set(releaseGood.id, true);
|
|
40
|
-
uniqueReleaseGoods.push(Object.assign({}, releaseGood));
|
|
41
|
-
}
|
|
31
|
+
const releaseGoods = worksheetDetails.map(worksheetDetail => worksheetDetail.targetInventory && worksheetDetail.targetInventory.releaseGood);
|
|
32
|
+
const uniqueReleaseGoods = [];
|
|
33
|
+
const map = new Map();
|
|
34
|
+
for (const releaseGood of releaseGoods) {
|
|
35
|
+
if (!map.has(releaseGood.id)) {
|
|
36
|
+
map.set(releaseGood.id, true);
|
|
37
|
+
uniqueReleaseGoods.push(Object.assign({}, releaseGood));
|
|
42
38
|
}
|
|
43
|
-
await Promise.all(uniqueReleaseGoods.map(async (releaseGood) => {
|
|
44
|
-
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
45
|
-
let foundReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
46
|
-
where: { id: releaseGood.id },
|
|
47
|
-
relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
|
|
48
|
-
});
|
|
49
|
-
if (!(foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.packageId)) {
|
|
50
|
-
foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
|
|
51
|
-
if (foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.packageId) {
|
|
52
|
-
await tx
|
|
53
|
-
.getRepository(sales_base_1.ReleaseGood)
|
|
54
|
-
.update({ id: foundReleaseGood.id }, { packageId: foundReleaseGood.packageId, updater: foundReleaseGood.updater });
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood);
|
|
58
|
-
}));
|
|
59
39
|
}
|
|
40
|
+
await Promise.all(uniqueReleaseGoods.map(async (releaseGood) => {
|
|
41
|
+
let foundReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
42
|
+
where: { id: releaseGood.id },
|
|
43
|
+
relations: ['orderProducts', 'orderProducts.product']
|
|
44
|
+
});
|
|
45
|
+
const orderSource = foundReleaseGood.source;
|
|
46
|
+
switch (orderSource) {
|
|
47
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
48
|
+
const sellercraft = await tx
|
|
49
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
50
|
+
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
51
|
+
if (sellercraft) {
|
|
52
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
53
|
+
if (!(foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.packageId)) {
|
|
54
|
+
foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
|
|
55
|
+
if (foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.packageId) {
|
|
56
|
+
await tx
|
|
57
|
+
.getRepository(sales_base_1.ReleaseGood)
|
|
58
|
+
.update({ id: foundReleaseGood.id }, { packageId: foundReleaseGood.packageId, updater: foundReleaseGood.updater });
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood);
|
|
62
|
+
}
|
|
63
|
+
break;
|
|
64
|
+
default:
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
}));
|
|
60
68
|
const pickPackTargetInventories = targetInventories
|
|
61
69
|
.filter(targetInventory => targetInventory.releaseGood.packingOption)
|
|
62
70
|
.map((pickPackTargetInventory) => {
|
|
@@ -77,7 +85,7 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
77
85
|
}
|
|
78
86
|
});
|
|
79
87
|
// loop to generate packing worksheet
|
|
80
|
-
for (
|
|
88
|
+
for (let i = 0; i < uniqueRoNo.length; i++) {
|
|
81
89
|
const releaseGoodNo = uniqueRoNo[i];
|
|
82
90
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
83
91
|
await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completePicking = exports.completePickingResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
7
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
7
8
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
@@ -48,130 +49,143 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
48
49
|
const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
|
|
49
50
|
const pickedTargetInventories = targetInventories.filter(targetInventory => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKED);
|
|
50
51
|
await pickingWSCtrl.completePicking(releaseGoodNo);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
52
|
+
const orderSource = releaseGood.source;
|
|
53
|
+
switch (orderSource) {
|
|
54
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
55
|
+
const sellercraft = await tx
|
|
56
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
57
|
+
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
58
|
+
const initSCOrderShipment = async (sellercraft) => {
|
|
59
|
+
if (sellercraft) {
|
|
60
|
+
await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
|
|
61
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(txMgr, domain, user);
|
|
62
|
+
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
|
|
63
|
+
const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
|
|
64
|
+
where: { releaseGood },
|
|
65
|
+
relations: ['product', 'product.productDetails']
|
|
66
|
+
});
|
|
67
|
+
releaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
|
|
68
|
+
if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId) {
|
|
69
|
+
await txMgr
|
|
70
|
+
.getRepository(sales_base_1.ReleaseGood)
|
|
71
|
+
.update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater });
|
|
72
|
+
}
|
|
65
73
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
});
|
|
107
|
-
//Get which transporter to use
|
|
108
|
-
const marketplaceTransporter = await tx.getRepository(integration_marketplace_1.MarketplaceTransporter).findOne({
|
|
109
|
-
where: { marketplaceStore: marketplaceOrder.marketplaceStore },
|
|
110
|
-
relations: ['pickupTransporter', 'deliveryTransporter']
|
|
111
|
-
});
|
|
112
|
-
const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
|
|
113
|
-
orderNo: marketplaceOrder.orderNo,
|
|
114
|
-
clientId: lmd.clientId,
|
|
115
|
-
clientType: lmd.clientType,
|
|
116
|
-
clientName: lmd.clientName,
|
|
117
|
-
transporterId: marketplaceTransporter.pickupTransporter.transporterId,
|
|
118
|
-
pickupName: warehouseContactPoint.name,
|
|
119
|
-
pickupAddress1: warehouseContactPoint.address,
|
|
120
|
-
pickupAddress2: warehouseContactPoint.address2,
|
|
121
|
-
pickupPostcode: warehouseContactPoint.postCode,
|
|
122
|
-
pickupState: warehouseContactPoint.state,
|
|
123
|
-
pickupCity: warehouseContactPoint.city,
|
|
124
|
-
pickupPhone: warehouseContactPoint.phone,
|
|
125
|
-
pickupEmail: warehouseContactPoint.email,
|
|
126
|
-
name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
|
|
127
|
-
address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
|
|
128
|
-
address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
|
|
129
|
-
postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
|
|
130
|
-
city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
|
|
131
|
-
state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
|
|
132
|
-
phone: marketplaceOrderShipping.phone1 || '',
|
|
133
|
-
email: marketplaceOrderShipping.email || '',
|
|
134
|
-
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
135
|
-
quantity: marketplaceOrderItems.length
|
|
136
|
-
});
|
|
137
|
-
const delay = (ms) => {
|
|
138
|
-
return new Promise(resolve => setTimeout(resolve, ms));
|
|
139
|
-
};
|
|
140
|
-
if (resp.Status === 'SUCCESS') {
|
|
141
|
-
//Success
|
|
142
|
-
let awbObtained = false;
|
|
143
|
-
let retry = 0;
|
|
144
|
-
while (!awbObtained) {
|
|
145
|
-
const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
146
|
-
where: { releaseOrderId: releaseGood.id },
|
|
147
|
-
relations: [
|
|
148
|
-
'marketplaceStore',
|
|
149
|
-
'marketplaceOrderItems',
|
|
150
|
-
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
151
|
-
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
152
|
-
]
|
|
153
|
-
});
|
|
154
|
-
const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping;
|
|
155
|
-
if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
|
|
156
|
-
awbObtained = true;
|
|
74
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
// asynchronouly call to initiate sellercraft order shipment/ RTS
|
|
79
|
+
initSCOrderShipment(sellercraft);
|
|
80
|
+
break;
|
|
81
|
+
case auth_base_1.ApplicationType.MMS:
|
|
82
|
+
const companyDomain = releaseGood.bizplace.company.domain;
|
|
83
|
+
let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
84
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
85
|
+
relations: [
|
|
86
|
+
'marketplaceStore',
|
|
87
|
+
'marketplaceOrderItems',
|
|
88
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
89
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
90
|
+
]
|
|
91
|
+
});
|
|
92
|
+
if (marketplaceOrder) {
|
|
93
|
+
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
94
|
+
let eTraxOption;
|
|
95
|
+
if (marketplaceStore.isAutoUpdateShipment) {
|
|
96
|
+
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
97
|
+
await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
|
|
98
|
+
}
|
|
99
|
+
if (!marketplaceOrder)
|
|
100
|
+
throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
|
|
101
|
+
eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
|
|
102
|
+
// if eTrax option is true
|
|
103
|
+
if (eTraxOption) {
|
|
104
|
+
const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
|
|
105
|
+
// access every marketplaceOrderItems for shipping information you need
|
|
106
|
+
// trigger the controller from integration-lmd that trigger the API, build the parameters needed
|
|
107
|
+
// for etrax didn't support multi awb per order
|
|
108
|
+
const marketplaceOrderShippingItems = marketplaceOrderItems[0].marketplaceOrderShippingItems;
|
|
109
|
+
const marketplaceOrderShipping = marketplaceOrderShippingItems[0].marketplaceOrderShipping;
|
|
110
|
+
const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
|
|
111
|
+
where: {
|
|
112
|
+
domain,
|
|
113
|
+
platform: 'eTrax'
|
|
157
114
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
115
|
+
});
|
|
116
|
+
//Get which transporter to use
|
|
117
|
+
const marketplaceTransporter = await tx
|
|
118
|
+
.getRepository(integration_marketplace_1.MarketplaceTransporter)
|
|
119
|
+
.findOne({
|
|
120
|
+
where: { marketplaceStore: marketplaceOrder.marketplaceStore },
|
|
121
|
+
relations: ['pickupTransporter', 'deliveryTransporter']
|
|
122
|
+
});
|
|
123
|
+
const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
|
|
124
|
+
orderNo: marketplaceOrder.orderNo,
|
|
125
|
+
clientId: lmd.clientId,
|
|
126
|
+
clientType: lmd.clientType,
|
|
127
|
+
clientName: lmd.clientName,
|
|
128
|
+
transporterId: marketplaceTransporter.pickupTransporter.transporterId,
|
|
129
|
+
pickupName: warehouseContactPoint.name,
|
|
130
|
+
pickupAddress1: warehouseContactPoint.address,
|
|
131
|
+
pickupAddress2: warehouseContactPoint.address2,
|
|
132
|
+
pickupPostcode: warehouseContactPoint.postCode,
|
|
133
|
+
pickupState: warehouseContactPoint.state,
|
|
134
|
+
pickupCity: warehouseContactPoint.city,
|
|
135
|
+
pickupPhone: warehouseContactPoint.phone,
|
|
136
|
+
pickupEmail: warehouseContactPoint.email,
|
|
137
|
+
name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
|
|
138
|
+
address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
|
|
139
|
+
address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
|
|
140
|
+
postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
|
|
141
|
+
city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
|
|
142
|
+
state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
|
|
143
|
+
phone: marketplaceOrderShipping.phone1 || '',
|
|
144
|
+
email: marketplaceOrderShipping.email || '',
|
|
145
|
+
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
146
|
+
quantity: marketplaceOrderItems.length
|
|
147
|
+
});
|
|
148
|
+
const delay = (ms) => {
|
|
149
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
150
|
+
};
|
|
151
|
+
if (resp.Status === 'SUCCESS') {
|
|
152
|
+
//Success
|
|
153
|
+
let awbObtained = false;
|
|
154
|
+
let retry = 0;
|
|
155
|
+
while (!awbObtained) {
|
|
156
|
+
const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
157
|
+
where: { releaseOrderId: releaseGood.id },
|
|
158
|
+
relations: [
|
|
159
|
+
'marketplaceStore',
|
|
160
|
+
'marketplaceOrderItems',
|
|
161
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
162
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
163
|
+
]
|
|
164
|
+
});
|
|
165
|
+
const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping;
|
|
166
|
+
if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
|
|
167
|
+
awbObtained = true;
|
|
168
|
+
}
|
|
169
|
+
await delay(5000);
|
|
170
|
+
//Timeout after 15sec
|
|
171
|
+
if (++retry > 3) {
|
|
172
|
+
break;
|
|
173
|
+
}
|
|
162
174
|
}
|
|
163
175
|
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
176
|
+
else {
|
|
177
|
+
if ((resp === null || resp === void 0 ? void 0 : resp.AWBurl) && (resp === null || resp === void 0 ? void 0 : resp.TrackingNo))
|
|
178
|
+
await tx
|
|
179
|
+
.getRepository(marketplace_base_1.MarketplaceOrderShipping)
|
|
180
|
+
.update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo });
|
|
181
|
+
else
|
|
182
|
+
throw resp;
|
|
183
|
+
}
|
|
172
184
|
}
|
|
173
185
|
}
|
|
174
|
-
|
|
186
|
+
break;
|
|
187
|
+
default:
|
|
188
|
+
break;
|
|
175
189
|
}
|
|
176
190
|
if (releaseGood.packingOption) {
|
|
177
191
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|