@things-factory/worksheet-base 4.3.211 → 4.3.212
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.
|
@@ -60,7 +60,7 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
60
60
|
};
|
|
61
61
|
let unprocessedOrderPackages = releaseGood.orderPackages.filter(op => !op.parcelId);
|
|
62
62
|
let packagesData = unprocessedOrderPackages.map(op => {
|
|
63
|
-
return Object.assign(Object.assign({}, data), { refNo: op.
|
|
63
|
+
return Object.assign(Object.assign({}, data), { refNo: op.name, items: op.orderPackageItems.map(opi => {
|
|
64
64
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
65
65
|
return {
|
|
66
66
|
quantity: ((_a = opi === null || opi === void 0 ? void 0 : opi.releaseQty) === null || _a === void 0 ? void 0 : _a.toString()) || ' ',
|
|
@@ -79,16 +79,21 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
79
79
|
if (parcelsRequest && parcelsRequest.length > 0) {
|
|
80
80
|
let res = await integration_lmd_1.LastMileAPI.createParcel(Object.assign(Object.assign({}, releaseGoods[0].lastMileDelivery), { platform: 'lmdMiddleware' }), parcelsRequest);
|
|
81
81
|
for (let parcel of res) {
|
|
82
|
-
await tx.getRepository(sales_base_1.OrderPackage).update({
|
|
82
|
+
await tx.getRepository(sales_base_1.OrderPackage).update({ name: parcel.refNo }, { parcelId: parcel.parcelId });
|
|
83
83
|
}
|
|
84
|
-
const qb = tx
|
|
84
|
+
const qb = tx
|
|
85
|
+
.getRepository(sales_base_1.OrderPackage)
|
|
85
86
|
.createQueryBuilder('op')
|
|
86
87
|
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
87
88
|
.innerJoinAndSelect('rg.domain', 'd')
|
|
88
89
|
.innerJoinAndSelect('rg.bizplace', 'b')
|
|
89
90
|
.innerJoinAndSelect('b.domain', 'd2')
|
|
90
91
|
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
91
|
-
.where('op.
|
|
92
|
+
.where('op.name IN (:...orderPackageIds)', {
|
|
93
|
+
orderPackageIds: res.map(parcel => {
|
|
94
|
+
return parcel.refNo;
|
|
95
|
+
})
|
|
96
|
+
});
|
|
92
97
|
const orderPackages = await qb.getMany();
|
|
93
98
|
await processAwbAndTrackingNo(orderPackages, tx);
|
|
94
99
|
}
|
|
@@ -107,15 +112,26 @@ async function processAwbAndTrackingNo(orderPackages, tx) {
|
|
|
107
112
|
let awbRes = await integration_lmd_1.LastMileAPI.getAwb(Object.assign(Object.assign({}, orderPackage.releaseGood.lastMileDelivery), { platform: 'lmdMiddleware' }), { parcelId: orderPackage.parcelId, staging: (_a = orderPackage.releaseGood.lastMileDelivery) === null || _a === void 0 ? void 0 : _a.staging });
|
|
108
113
|
if (awbRes) {
|
|
109
114
|
let awbContent;
|
|
115
|
+
let awb;
|
|
110
116
|
const { deliveryConfirmationNo, tracking_no } = awbRes;
|
|
111
117
|
if (awbRes.content) {
|
|
112
|
-
|
|
118
|
+
if (orderPackage.releaseGood.lastMileDelivery.platform == 'POSLAJU' || orderPackage.releaseGood.lastMileDelivery.platform == 'SAPX') {
|
|
119
|
+
const response = await fetch(awbRes.content, {
|
|
120
|
+
method: 'get'
|
|
121
|
+
});
|
|
122
|
+
awbContent = await response.buffer();
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
awbContent = Buffer.from(awbRes.content, 'base64');
|
|
126
|
+
}
|
|
113
127
|
}
|
|
114
128
|
else {
|
|
115
129
|
awbContent = await constructAwb(orderPackage, awbRes);
|
|
116
130
|
}
|
|
117
|
-
|
|
118
|
-
await tx
|
|
131
|
+
awb = await uploadAwbToS3(awbContent, orderPackage);
|
|
132
|
+
await tx
|
|
133
|
+
.getRepository(sales_base_1.OrderPackage)
|
|
134
|
+
.update({ name: orderPackage.name }, { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no });
|
|
119
135
|
releaseOrders.push(orderPackage.releaseGood);
|
|
120
136
|
}
|
|
121
137
|
}
|
|
@@ -205,7 +221,7 @@ async function uploadAwbToS3(result, orderPackage) {
|
|
|
205
221
|
name: uuid,
|
|
206
222
|
mimetype: 'application/pdf',
|
|
207
223
|
category: 'LMD_AWB',
|
|
208
|
-
refBy: orderPackage.
|
|
224
|
+
refBy: orderPackage.name,
|
|
209
225
|
path: awb.url,
|
|
210
226
|
domain: releaseOrder.domain,
|
|
211
227
|
size: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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
|
|
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.212",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,18 +28,18 @@
|
|
|
28
28
|
"@things-factory/document-template-base": "^4.3.179",
|
|
29
29
|
"@things-factory/id-rule-base": "^4.3.187",
|
|
30
30
|
"@things-factory/integration-accounting": "^4.3.204",
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.212",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.212",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.212",
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.190",
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.212",
|
|
36
36
|
"@things-factory/notification": "^4.3.186",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.212",
|
|
38
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.212",
|
|
42
42
|
"uuid": "^9.0.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "16651f95d911fe112b0e4e92dc5c1c1c219a19ee"
|
|
45
45
|
}
|
package/server/utils/lmd-util.ts
CHANGED
|
@@ -34,7 +34,7 @@ export async function createLmdParcel(releaseGoods, tx) {
|
|
|
34
34
|
const senderGeoArea: GeoArea = await tx
|
|
35
35
|
.getRepository(GeoArea)
|
|
36
36
|
.findOne({ where: { postalCode: bizplace.postalCode } })
|
|
37
|
-
|
|
37
|
+
|
|
38
38
|
const recipientGeoArea: GeoArea = await tx
|
|
39
39
|
.getRepository(GeoArea)
|
|
40
40
|
.findOne({ where: { postalCode: releaseGood.postalCode } })
|
|
@@ -75,7 +75,7 @@ export async function createLmdParcel(releaseGoods, tx) {
|
|
|
75
75
|
let packagesData = unprocessedOrderPackages.map(op => {
|
|
76
76
|
return {
|
|
77
77
|
...data,
|
|
78
|
-
refNo: op.
|
|
78
|
+
refNo: op.name,
|
|
79
79
|
items: op.orderPackageItems.map(opi => {
|
|
80
80
|
return {
|
|
81
81
|
quantity: opi?.releaseQty?.toString() || ' ',
|
|
@@ -99,17 +99,22 @@ export async function createLmdParcel(releaseGoods, tx) {
|
|
|
99
99
|
parcelsRequest
|
|
100
100
|
)
|
|
101
101
|
for (let parcel of res) {
|
|
102
|
-
await tx.getRepository(OrderPackage).update({
|
|
102
|
+
await tx.getRepository(OrderPackage).update({ name: parcel.refNo }, { parcelId: parcel.parcelId })
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
const qb: SelectQueryBuilder<OrderPackage> = tx
|
|
105
|
+
const qb: SelectQueryBuilder<OrderPackage> = tx
|
|
106
|
+
.getRepository(OrderPackage)
|
|
106
107
|
.createQueryBuilder('op')
|
|
107
108
|
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
108
109
|
.innerJoinAndSelect('rg.domain', 'd')
|
|
109
110
|
.innerJoinAndSelect('rg.bizplace', 'b')
|
|
110
111
|
.innerJoinAndSelect('b.domain', 'd2')
|
|
111
112
|
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
112
|
-
.where('op.
|
|
113
|
+
.where('op.name IN (:...orderPackageIds)', {
|
|
114
|
+
orderPackageIds: res.map(parcel => {
|
|
115
|
+
return parcel.refNo
|
|
116
|
+
})
|
|
117
|
+
})
|
|
113
118
|
|
|
114
119
|
const orderPackages: OrderPackage[] = await qb.getMany()
|
|
115
120
|
await processAwbAndTrackingNo(orderPackages, tx)
|
|
@@ -124,30 +129,37 @@ export async function processAwbAndTrackingNo(orderPackages, tx) {
|
|
|
124
129
|
|
|
125
130
|
for (let orderPackage of orderPackages) {
|
|
126
131
|
// await getConnection().transaction(async tx => {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
132
|
+
try {
|
|
133
|
+
let awbRes = await LastMileAPI.getAwb(
|
|
134
|
+
{ ...orderPackage.releaseGood.lastMileDelivery, platform: 'lmdMiddleware' },
|
|
135
|
+
{ parcelId: orderPackage.parcelId, staging: orderPackage.releaseGood.lastMileDelivery?.staging }
|
|
136
|
+
)
|
|
137
|
+
|
|
138
|
+
if (awbRes) {
|
|
139
|
+
let awbContent: any
|
|
140
|
+
let awb: any
|
|
141
|
+
const { deliveryConfirmationNo, tracking_no } = awbRes
|
|
142
|
+
if (awbRes.content) {
|
|
143
|
+
if (orderPackage.releaseGood.lastMileDelivery.platform == 'POSLAJU' || orderPackage.releaseGood.lastMileDelivery.platform == 'SAPX') {
|
|
144
|
+
const response: any = await fetch(awbRes.content, {
|
|
145
|
+
method: 'get'
|
|
146
|
+
})
|
|
147
|
+
awbContent = await response.buffer()
|
|
138
148
|
} else {
|
|
139
|
-
awbContent =
|
|
149
|
+
awbContent = Buffer.from(awbRes.content, 'base64')
|
|
140
150
|
}
|
|
141
|
-
|
|
142
|
-
await
|
|
143
|
-
{ id: orderPackage.id },
|
|
144
|
-
{ airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no }
|
|
145
|
-
)
|
|
146
|
-
releaseOrders.push(orderPackage.releaseGood)
|
|
151
|
+
} else {
|
|
152
|
+
awbContent = await constructAwb(orderPackage, awbRes)
|
|
147
153
|
}
|
|
148
|
-
|
|
149
|
-
|
|
154
|
+
awb = await uploadAwbToS3(awbContent, orderPackage)
|
|
155
|
+
await tx
|
|
156
|
+
.getRepository(OrderPackage)
|
|
157
|
+
.update({ name: orderPackage.name }, { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no })
|
|
158
|
+
releaseOrders.push(orderPackage.releaseGood)
|
|
150
159
|
}
|
|
160
|
+
} catch (e) {
|
|
161
|
+
logger.error(e)
|
|
162
|
+
}
|
|
151
163
|
// })
|
|
152
164
|
}
|
|
153
165
|
|
|
@@ -264,7 +276,7 @@ async function uploadAwbToS3(result, orderPackage) {
|
|
|
264
276
|
name: uuid,
|
|
265
277
|
mimetype: 'application/pdf',
|
|
266
278
|
category: 'LMD_AWB',
|
|
267
|
-
refBy: orderPackage.
|
|
279
|
+
refBy: orderPackage.name,
|
|
268
280
|
path: awb.url,
|
|
269
281
|
domain: releaseOrder.domain,
|
|
270
282
|
size: 0,
|