@things-factory/worksheet-base 4.3.185 → 4.3.186
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 +4 -1
- package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
- package/dist-server/controllers/ecommerce/sellercraft-controller.js +10 -1
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +13 -2
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/pos/xilnex-controller.js +5 -1
- package/dist-server/controllers/pos/xilnex-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +23 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +36 -27
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +16 -2
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +15 -3
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/index.js +1 -0
- package/dist-server/index.js.map +1 -1
- package/dist-server/utils/index.js +1 -0
- package/dist-server/utils/index.js.map +1 -1
- package/dist-server/utils/lmd-util.js +76 -0
- package/dist-server/utils/lmd-util.js.map +1 -0
- package/package.json +13 -13
- package/server/controllers/ecommerce/ecommerce-controller.ts +4 -1
- package/server/controllers/ecommerce/sellercraft-controller.ts +15 -1
- package/server/controllers/outbound/picking-worksheet-controller.ts +18 -7
- package/server/controllers/pos/xilnex-controller.ts +6 -1
- package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +22 -1
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +80 -42
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +16 -2
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +16 -2
- package/server/index.ts +1 -0
- package/server/utils/index.ts +1 -0
- package/server/utils/lmd-util.ts +86 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAG3C,6CAA4C;AAC5C,mFAA+E;AAC/E,2DAQmC;AAEnC,mEAMuC;AAEvC,gDAA8D;
|
|
1
|
+
{"version":3,"file":"confirm-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,23 +11,16 @@ exports.inventoriesByPalletResolver = {
|
|
|
11
11
|
const { domain, user } = context.state;
|
|
12
12
|
const params = { filters, pagination };
|
|
13
13
|
let permittedBizplaceIds = await (0, biz_base_1.getPermittedBizplaceIds)(domain, user);
|
|
14
|
+
const bizplaceId = params.filters.find(x => x.name == 'bizplace_id');
|
|
14
15
|
const productFilters = params.filters.filter(x => x.name == 'productName');
|
|
15
16
|
const recallFilters = params.filters.find(x => x.name === 'recall');
|
|
16
17
|
const skipLockCheckFilters = params.filters.find(x => x.name === 'skipLockCheck');
|
|
17
18
|
let skipLockCheck = skipLockCheckFilters && (skipLockCheckFilters === null || skipLockCheckFilters === void 0 ? void 0 : skipLockCheckFilters.value) ? skipLockCheckFilters === null || skipLockCheckFilters === void 0 ? void 0 : skipLockCheckFilters.value : false;
|
|
18
19
|
const productFilterColumns = ['sku', 'brandSku', 'name', 'description', 'brand', 'subBrand'];
|
|
19
20
|
params.filters = params.filters.filter(x => x.name != 'productName');
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
operator: 'in',
|
|
24
|
-
value: permittedBizplaceIds,
|
|
25
|
-
relation: true
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
permittedBizplaceIds = params.filters.find(filter => filter.name === 'bizplace').value;
|
|
30
|
-
params.filters.find(filter => filter.name === 'bizplace').relation = true;
|
|
21
|
+
const batchIdFilters = params.filters.find(x => x.name == 'batchId');
|
|
22
|
+
if (!params.filters.find((filter) => filter.name === 'bizplace_id')) {
|
|
23
|
+
throw new Error('No Bizplace found');
|
|
31
24
|
}
|
|
32
25
|
const locationFilters = params.filters.find(x => x.name == 'locationName');
|
|
33
26
|
params.filters = params.filters.filter(x => x.name != 'locationName');
|
|
@@ -54,23 +47,49 @@ exports.inventoriesByPalletResolver = {
|
|
|
54
47
|
oi.product_id = p2.id
|
|
55
48
|
WHERE
|
|
56
49
|
oi.status = '${sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT}'
|
|
57
|
-
AND oi.bizplace_id IN (:...permittedBizplaceIds)
|
|
58
50
|
AND oi.domain_id = (:domainId)
|
|
59
|
-
|
|
51
|
+
AND oi.bizplace_id = (:bizplaceId)
|
|
52
|
+
)`, { bizplaceId: bizplaceId.value, domainId: domain.id });
|
|
53
|
+
if (locationFilters) {
|
|
54
|
+
qb.andWhere(`location.name ilike '${locationFilters.value}'`);
|
|
55
|
+
}
|
|
56
|
+
if (productFilters && productFilters.length > 0) {
|
|
57
|
+
let productInfo = productFilters[0];
|
|
58
|
+
qb.andWhere(new typeorm_1.Brackets(qb2 => {
|
|
59
|
+
productFilterColumns.forEach(filter => {
|
|
60
|
+
const condition = (0, shell_1.buildCondition)('product', filter, 'i_like', productInfo.value, false, Object.keys(qb.getParameters()).length);
|
|
61
|
+
qb2.orWhere(condition.clause, condition.parameters);
|
|
62
|
+
});
|
|
63
|
+
}));
|
|
64
|
+
}
|
|
60
65
|
if (!skipLockCheck) {
|
|
61
66
|
qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0');
|
|
62
67
|
qb.andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0');
|
|
63
68
|
}
|
|
64
69
|
if ((recallFilters === null || recallFilters === void 0 ? void 0 : recallFilters.value) === true) {
|
|
65
|
-
qb.orWhere('(iv.
|
|
70
|
+
qb.orWhere('(iv.domain_id = (:domainId) and iv.bizplace_id = (:bizplaceId)');
|
|
71
|
+
if (locationFilters) {
|
|
72
|
+
qb.andWhere(`location.name ilike '${locationFilters.value}'`);
|
|
73
|
+
}
|
|
74
|
+
if (productFilters && productFilters.length > 0) {
|
|
75
|
+
let productInfo = productFilters[0];
|
|
76
|
+
qb.andWhere(new typeorm_1.Brackets(qb2 => {
|
|
77
|
+
productFilterColumns.forEach(filter => {
|
|
78
|
+
const condition = (0, shell_1.buildCondition)('product', filter, 'i_like', productInfo.value, false, Object.keys(qb.getParameters()).length);
|
|
79
|
+
qb2.orWhere(condition.clause, condition.parameters);
|
|
80
|
+
});
|
|
81
|
+
}));
|
|
82
|
+
}
|
|
83
|
+
if (batchIdFilters) {
|
|
84
|
+
qb.andWhere(`iv.batch_id ilike '${batchIdFilters.value}'`);
|
|
85
|
+
}
|
|
86
|
+
qb.andWhere('iv.obsolete = true and case when iv.expiration_date is not null and product.shelf_life is not null then CURRENT_DATE > iv.expiration_date - product.shelf_life else true end)');
|
|
66
87
|
}
|
|
67
88
|
else {
|
|
68
89
|
qb.andWhere('iv.obsolete = false');
|
|
69
90
|
qb.andWhere('case when iv.expiration_date is not null and product.shelf_life is not null then CURRENT_DATE < iv.expiration_date - product.shelf_life else true end');
|
|
70
91
|
}
|
|
71
|
-
|
|
72
|
-
qb.andWhere(`location.name ilike '${locationFilters.value}'`);
|
|
73
|
-
}
|
|
92
|
+
let [items, total] = await qb.getManyAndCount();
|
|
74
93
|
if ((sortings === null || sortings === void 0 ? void 0 : sortings.length) !== 0) {
|
|
75
94
|
const arrChildSortData = ['productName', 'productSKU'];
|
|
76
95
|
const remapChildSortData = ['name', 'sku'];
|
|
@@ -85,16 +104,6 @@ exports.inventoriesByPalletResolver = {
|
|
|
85
104
|
else {
|
|
86
105
|
qb.addOrderBy('location.name', 'DESC');
|
|
87
106
|
}
|
|
88
|
-
if (productFilters && productFilters.length > 0) {
|
|
89
|
-
let productInfo = productFilters[0];
|
|
90
|
-
qb.andWhere(new typeorm_1.Brackets(qb2 => {
|
|
91
|
-
productFilterColumns.forEach(filter => {
|
|
92
|
-
const condition = (0, shell_1.buildCondition)('product', filter, 'i_like', productInfo.value, false, Object.keys(qb.getParameters()).length);
|
|
93
|
-
qb2.orWhere(condition.clause, condition.parameters);
|
|
94
|
-
});
|
|
95
|
-
}));
|
|
96
|
-
}
|
|
97
|
-
let [items, total] = await qb.getManyAndCount();
|
|
98
107
|
items = await Promise.all(items.map(async (item) => {
|
|
99
108
|
const { remainQty, remainUomValue } = await getRemainAmount(item);
|
|
100
109
|
return Object.assign(Object.assign({}, item), { remainQty,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ const controllers_1 = require("../../../../controllers/");
|
|
|
13
13
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
14
14
|
const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
|
|
15
15
|
const entities_1 = require("../../../../entities");
|
|
16
|
+
const utils_1 = require("../../../../utils");
|
|
16
17
|
exports.completeBatchPickingResolver = {
|
|
17
18
|
async completeBatchPicking(_, { taskNo }, context) {
|
|
18
19
|
const { tx, domain, user } = context.state;
|
|
@@ -31,6 +32,7 @@ exports.completeBatchPickingResolver = {
|
|
|
31
32
|
}
|
|
32
33
|
};
|
|
33
34
|
async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
35
|
+
var _a, _b;
|
|
34
36
|
const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
35
37
|
const worksheet = await pickingWSCtrl.completeBatchPicking(taskNo);
|
|
36
38
|
if (worksheet === null || worksheet === void 0 ? void 0 : worksheet.type) {
|
|
@@ -54,9 +56,14 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
54
56
|
'domain',
|
|
55
57
|
'creator',
|
|
56
58
|
'updater',
|
|
59
|
+
'lastMileDelivery',
|
|
57
60
|
'orderPackages',
|
|
61
|
+
'orderPackages.orderPackageItems',
|
|
62
|
+
'orderPackages.orderPackageItems.orderProduct',
|
|
63
|
+
'orderPackages.orderPackageItems.orderProduct.product',
|
|
58
64
|
'orderProducts',
|
|
59
65
|
'orderProducts.product',
|
|
66
|
+
'orderProducts.productDetail',
|
|
60
67
|
'bizplace',
|
|
61
68
|
'bizplace.company',
|
|
62
69
|
'bizplace.company.domain'
|
|
@@ -105,10 +112,10 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
105
112
|
if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
|
|
106
113
|
await ecommerceCtrl.createOrderShip(foundReleaseGood, marketplaceStore, marketplaceOrder, companyDomain);
|
|
107
114
|
}
|
|
108
|
-
await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, foundReleaseGood);
|
|
115
|
+
foundReleaseGood = await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, foundReleaseGood);
|
|
109
116
|
break;
|
|
110
117
|
default:
|
|
111
|
-
|
|
118
|
+
let orderPackage = {
|
|
112
119
|
name: sales_base_1.OrderNoGenerator.orderPackage(),
|
|
113
120
|
packageId: null,
|
|
114
121
|
trackingNo: null,
|
|
@@ -136,8 +143,15 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
|
|
|
136
143
|
};
|
|
137
144
|
});
|
|
138
145
|
await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
|
|
146
|
+
orderPackage.orderPackageItems = orderPackageItems;
|
|
147
|
+
foundReleaseGood.orderPackages = [orderPackage];
|
|
139
148
|
break;
|
|
140
149
|
}
|
|
150
|
+
// trigger LMD API to create parcel
|
|
151
|
+
if (((_a = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) && foundReleaseGood.lmdOption && foundReleaseGood.lastMileDelivery && ((_b = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
|
|
152
|
+
await (0, utils_1.createLmdParcel)([foundReleaseGood], tx);
|
|
153
|
+
}
|
|
154
|
+
//
|
|
141
155
|
}
|
|
142
156
|
const pickPackTargetInventories = targetInventories
|
|
143
157
|
.filter(targetInventory => targetInventory.releaseGood.packingOption)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":";;;AAAA,qCAAuD;AAEvD,yDAAiE;AACjE,uDAAkE;AAElE,qFAAwF;AACxF,uEAAmE;AACnE,2DAOmC;AACnC,+DAAsD;AAEtD,mEAA0D;AAE1D,0DAKiC;AACjC,iEAAuE;AACvE,uFAAkF;AAClF,mDAAiE;
|
|
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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"}
|
|
@@ -18,6 +18,7 @@ const controllers_1 = require("../../../../controllers/");
|
|
|
18
18
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
19
19
|
const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
|
|
20
20
|
const entities_1 = require("../../../../entities");
|
|
21
|
+
const utils_1 = require("../../../../utils");
|
|
21
22
|
exports.completePickingResolver = {
|
|
22
23
|
async completePicking(_, { releaseGoodNo }, context) {
|
|
23
24
|
const { tx, domain, user } = context.state;
|
|
@@ -36,7 +37,7 @@ exports.completePickingResolver = {
|
|
|
36
37
|
}
|
|
37
38
|
};
|
|
38
39
|
async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
39
|
-
var _a, _b;
|
|
40
|
+
var _a, _b, _c, _d;
|
|
40
41
|
const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
41
42
|
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
42
43
|
where: { domain, name: releaseGoodNo },
|
|
@@ -46,7 +47,11 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
46
47
|
'bizplace.domain',
|
|
47
48
|
'bizplace.company',
|
|
48
49
|
'bizplace.company.domain',
|
|
50
|
+
'lastMileDelivery',
|
|
49
51
|
'orderPackages',
|
|
52
|
+
'orderPackages.orderPackageItems',
|
|
53
|
+
'orderPackages.orderPackageItems.orderProduct',
|
|
54
|
+
'orderPackages.orderPackageItems.orderProduct.product',
|
|
50
55
|
'orderProducts',
|
|
51
56
|
'orderProducts.product',
|
|
52
57
|
'orderProducts.productDetail',
|
|
@@ -208,11 +213,11 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
208
213
|
throw resp;
|
|
209
214
|
}
|
|
210
215
|
}
|
|
211
|
-
await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
|
|
216
|
+
releaseGood = await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
|
|
212
217
|
}
|
|
213
218
|
break;
|
|
214
219
|
default:
|
|
215
|
-
|
|
220
|
+
let orderPackage = {
|
|
216
221
|
name: sales_base_1.OrderNoGenerator.orderPackage(),
|
|
217
222
|
packageId: null,
|
|
218
223
|
trackingNo: null,
|
|
@@ -240,6 +245,8 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
240
245
|
};
|
|
241
246
|
});
|
|
242
247
|
await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
|
|
248
|
+
orderPackage.orderPackageItems = orderPackageItems;
|
|
249
|
+
releaseGood.orderPackages = [orderPackage];
|
|
243
250
|
break;
|
|
244
251
|
}
|
|
245
252
|
const account = await tx
|
|
@@ -336,6 +343,11 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
336
343
|
await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
|
|
337
344
|
}
|
|
338
345
|
}
|
|
346
|
+
// trigger LMD API to create parcel
|
|
347
|
+
if (((_c = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _c === void 0 ? void 0 : _c.length) && releaseGood.lmdOption && releaseGood.lastMileDelivery && ((_d = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _d === void 0 ? void 0 : _d.some(op => op.parcelId == null))) {
|
|
348
|
+
await (0, utils_1.createLmdParcel)([releaseGood], tx);
|
|
349
|
+
}
|
|
350
|
+
//
|
|
339
351
|
}
|
|
340
352
|
else {
|
|
341
353
|
//update inventories obsolete to true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
package/dist-server/index.js
CHANGED
|
@@ -21,4 +21,5 @@ __exportStar(require("./graphql"), exports);
|
|
|
21
21
|
__exportStar(require("./graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet"), exports);
|
|
22
22
|
__exportStar(require("./graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details"), exports);
|
|
23
23
|
__exportStar(require("./migrations"), exports);
|
|
24
|
+
__exportStar(require("./utils"), exports);
|
|
24
25
|
//# sourceMappingURL=index.js.map
|
package/dist-server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,+CAA4B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,+CAA4B;AAC5B,0CAAuB"}
|
|
@@ -18,4 +18,5 @@ __exportStar(require("./inventory-util"), exports);
|
|
|
18
18
|
__exportStar(require("./worksheet-no-generator"), exports);
|
|
19
19
|
__exportStar(require("./datetime-util"), exports);
|
|
20
20
|
__exportStar(require("./worksheet-util"), exports);
|
|
21
|
+
__exportStar(require("./lmd-util"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,2DAAwC;AACxC,kDAA+B;AAC/B,mDAAgC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,2DAAwC;AACxC,kDAA+B;AAC/B,mDAAgC;AAChC,6CAA0B"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createLmdParcel = void 0;
|
|
4
|
+
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
5
|
+
const env_1 = require("@things-factory/env");
|
|
6
|
+
const geography_1 = require("@things-factory/geography");
|
|
7
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
8
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
9
|
+
async function createLmdParcel(releaseGoods, tx) {
|
|
10
|
+
try {
|
|
11
|
+
let parcelsRequest = [];
|
|
12
|
+
for (let releaseGood of releaseGoods) {
|
|
13
|
+
const lmd = releaseGood.lastMileDelivery;
|
|
14
|
+
const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
|
|
15
|
+
where: { domain: releaseGood.domain },
|
|
16
|
+
relations: ['domain']
|
|
17
|
+
});
|
|
18
|
+
const senderGeoArea = await tx
|
|
19
|
+
.getRepository(geography_1.GeoArea)
|
|
20
|
+
.findOne({ where: { postalCode: bizplace.postalCode } });
|
|
21
|
+
let data = {
|
|
22
|
+
courier: lmd.platform,
|
|
23
|
+
clientId: lmd === null || lmd === void 0 ? void 0 : lmd.clientId,
|
|
24
|
+
clientPass: lmd === null || lmd === void 0 ? void 0 : lmd.secretKey,
|
|
25
|
+
pickupAccountId: lmd === null || lmd === void 0 ? void 0 : lmd.pickupAccountId,
|
|
26
|
+
soldToAccountId: lmd === null || lmd === void 0 ? void 0 : lmd.soldToAccountId,
|
|
27
|
+
token: lmd === null || lmd === void 0 ? void 0 : lmd.accessToken,
|
|
28
|
+
recipient: releaseGood.attentionTo,
|
|
29
|
+
phone: releaseGood.phone1,
|
|
30
|
+
email: releaseGood.email,
|
|
31
|
+
address: releaseGood.deliveryAddress1,
|
|
32
|
+
address2: releaseGood.deliveryAddress2,
|
|
33
|
+
city: releaseGood.city,
|
|
34
|
+
postcode: releaseGood.postalCode,
|
|
35
|
+
district: releaseGood.city,
|
|
36
|
+
state: releaseGood.state,
|
|
37
|
+
country: releaseGood.country,
|
|
38
|
+
pAddress: bizplace.address,
|
|
39
|
+
pAddress2: bizplace.address2,
|
|
40
|
+
pCity: senderGeoArea.cityName,
|
|
41
|
+
pPostcode: senderGeoArea.postalCode,
|
|
42
|
+
pDistrict: senderGeoArea.cityName,
|
|
43
|
+
pState: senderGeoArea.stateName,
|
|
44
|
+
pCountry: senderGeoArea.countryCode,
|
|
45
|
+
};
|
|
46
|
+
let unprocessedOrderPackages = releaseGood.orderPackages.filter(op => !op.parcelId);
|
|
47
|
+
let packagesData = unprocessedOrderPackages.map(op => {
|
|
48
|
+
return Object.assign(Object.assign({}, data), { refNo: op.id, items: op.orderPackageItems.map(opi => {
|
|
49
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
50
|
+
return {
|
|
51
|
+
quantity: ((_a = opi === null || opi === void 0 ? void 0 : opi.releaseQty) === null || _a === void 0 ? void 0 : _a.toString()) || ' ',
|
|
52
|
+
item: opi.orderProduct.product.name.slice(0, 49).trim() || ' ',
|
|
53
|
+
sku: opi.orderProduct.product.sku || ' ',
|
|
54
|
+
price: ((_c = (_b = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _b === void 0 ? void 0 : _b.costPrice) === null || _c === void 0 ? void 0 : _c.toString()) || ' ',
|
|
55
|
+
weight: ((_e = (_d = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _d === void 0 ? void 0 : _d.grossWeight) === null || _e === void 0 ? void 0 : _e.toString()) || ' ',
|
|
56
|
+
width: ((_g = (_f = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _f === void 0 ? void 0 : _f.width) === null || _g === void 0 ? void 0 : _g.toString()) || ' ',
|
|
57
|
+
length: ((_j = (_h = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _h === void 0 ? void 0 : _h.depth) === null || _j === void 0 ? void 0 : _j.toString()) || ' ',
|
|
58
|
+
height: ((_l = (_k = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _k === void 0 ? void 0 : _k.height) === null || _l === void 0 ? void 0 : _l.toString()) || ' '
|
|
59
|
+
};
|
|
60
|
+
}) });
|
|
61
|
+
});
|
|
62
|
+
parcelsRequest.push(...packagesData);
|
|
63
|
+
}
|
|
64
|
+
if (parcelsRequest && parcelsRequest.length > 0) {
|
|
65
|
+
let res = await integration_lmd_1.LastMileAPI.createParcel(Object.assign(Object.assign({}, releaseGoods[0].lastMileDelivery), { platform: 'lmdMiddleware' }), parcelsRequest);
|
|
66
|
+
for (let parcel of res) {
|
|
67
|
+
await tx.getRepository(sales_base_1.OrderPackage).update({ id: parcel.refNo }, { parcelId: parcel.parcelId });
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
env_1.logger.error(`[lmd-create-parcel]: ${e}`);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
exports.createLmdParcel = createLmdParcel;
|
|
76
|
+
//# sourceMappingURL=lmd-util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.186",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -26,19 +26,19 @@
|
|
|
26
26
|
"@things-factory/auth-base": "^4.3.179",
|
|
27
27
|
"@things-factory/biz-base": "^4.3.179",
|
|
28
28
|
"@things-factory/document-template-base": "^4.3.179",
|
|
29
|
-
"@things-factory/id-rule-base": "^4.3.
|
|
30
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
34
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
36
|
-
"@things-factory/notification": "^4.3.
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
38
|
-
"@things-factory/setting-base": "^4.3.
|
|
29
|
+
"@things-factory/id-rule-base": "^4.3.186",
|
|
30
|
+
"@things-factory/integration-accounting": "^4.3.186",
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.186",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.186",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.186",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.3.186",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.186",
|
|
36
|
+
"@things-factory/notification": "^4.3.186",
|
|
37
|
+
"@things-factory/sales-base": "^4.3.186",
|
|
38
|
+
"@things-factory/setting-base": "^4.3.186",
|
|
39
39
|
"@things-factory/shell": "^4.3.179",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.179",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.186"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "854c79b134b5d94c5635c75c467eca229430183b"
|
|
44
44
|
}
|
|
@@ -232,7 +232,7 @@ export class EcommerceController extends WorksheetController {
|
|
|
232
232
|
? marketplaceOrderShipping.ownTransporter
|
|
233
233
|
: marketplaceOrderShipping.transporter
|
|
234
234
|
|
|
235
|
-
|
|
235
|
+
let orderPackage: OrderPackage = {
|
|
236
236
|
name: OrderNoGenerator.orderPackage(),
|
|
237
237
|
packageId: null,
|
|
238
238
|
trackingNo,
|
|
@@ -262,5 +262,8 @@ export class EcommerceController extends WorksheetController {
|
|
|
262
262
|
})
|
|
263
263
|
|
|
264
264
|
await tx.getRepository(OrderPackageItem).save(orderPackageItems)
|
|
265
|
+
orderPackage.orderPackageItems = orderPackageItems
|
|
266
|
+
releaseGood.orderPackages = [orderPackage]
|
|
267
|
+
return releaseGood
|
|
265
268
|
}
|
|
266
269
|
}
|
|
@@ -336,12 +336,26 @@ export class SellercraftController extends WorksheetController {
|
|
|
336
336
|
.filter(op => op?.marketRtsCallSuccess == undefined)
|
|
337
337
|
.map(async op => {
|
|
338
338
|
if (!op?.packageId) throw new Error('Order package id is not found')
|
|
339
|
+
if (releaseGood.lmdOption && !op?.parcelId) return
|
|
339
340
|
|
|
340
|
-
|
|
341
|
+
let orderInformation: any = {
|
|
341
342
|
accountId: sellercraft.accountId,
|
|
342
343
|
orderId: releaseGood.refNo2,
|
|
343
344
|
packageId: op.packageId
|
|
344
345
|
}
|
|
346
|
+
if (releaseGood.lmdOption) {
|
|
347
|
+
let releaseGoodQuery: ReleaseGood = await getRepository(ReleaseGood).findOne({
|
|
348
|
+
where: { id: releaseGood.id },
|
|
349
|
+
relations: ['lastMileDelivery']
|
|
350
|
+
})
|
|
351
|
+
orderInformation = {
|
|
352
|
+
...orderInformation,
|
|
353
|
+
awb: op.airwayBill,
|
|
354
|
+
trackingNo: op.trackingNo,
|
|
355
|
+
lmdOption: releaseGood.lmdOption,
|
|
356
|
+
shipperName: releaseGoodQuery.lastMileDelivery.platform
|
|
357
|
+
}
|
|
358
|
+
}
|
|
345
359
|
|
|
346
360
|
try {
|
|
347
361
|
await SellercraftAPI.initiateOrderShipment(sellercraft, {
|