@things-factory/worksheet-base 4.3.827 → 4.3.829
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/outbound/packing-worksheet-controller.js +15 -8
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/fetch-powrup-document.js +4 -2
- package/dist-server/graphql/resolvers/worksheet/fetch-powrup-document.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-document.js +3 -2
- package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-document.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +24 -11
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +46 -48
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +26 -21
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +37 -32
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/package.json +2 -2
- package/server/controllers/outbound/packing-worksheet-controller.ts +16 -9
- package/server/graphql/resolvers/worksheet/fetch-powrup-document.ts +4 -2
- package/server/graphql/resolvers/worksheet/fetch-sellercraft-document.ts +4 -3
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +28 -17
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +46 -48
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +25 -20
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +37 -32
|
@@ -1 +1 @@
|
|
|
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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
|
|
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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"}
|
|
@@ -121,21 +121,22 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
121
121
|
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
122
122
|
if (sellercraft) {
|
|
123
123
|
const initSCOrderShipment = async (sellercraft, rtsTriggerLevel) => {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
124
|
+
var _a;
|
|
125
|
+
// Issue #4104: don't wrap marketplace HTTP calls in a transaction.
|
|
126
|
+
// Bind the controller to getManager() (auto-commit) and use the
|
|
127
|
+
// global repository for the orderProducts read.
|
|
128
|
+
const sellercraftCtrl = new controllers_1.SellercraftController((0, typeorm_1.getManager)(), domain, user);
|
|
129
|
+
if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketPackCallSuccess)) {
|
|
130
|
+
///// Q: why need to refetch Order Products?
|
|
131
|
+
const orderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
|
|
132
|
+
where: { releaseGood },
|
|
133
|
+
relations: ['product', 'product.productDetails', 'productDetail']
|
|
134
|
+
});
|
|
135
|
+
await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
|
|
136
|
+
}
|
|
137
|
+
// Trigger if RTS Trigger Level Setting == 1
|
|
138
|
+
if (rtsTriggerLevel == 1)
|
|
139
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
139
140
|
};
|
|
140
141
|
// asynchronouly call to initiate sellercraft order shipment/ RTS
|
|
141
142
|
initSCOrderShipment(sellercraft, rtsTriggerLevel);
|
|
@@ -145,21 +146,21 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
145
146
|
const powrup = await tx.getRepository(integration_powrup_1.Powrup).findOne({ active: true, platform: 'POWRUP' });
|
|
146
147
|
if (powrup) {
|
|
147
148
|
const initPowrupShipment = async (powrup, rtsTriggerLevel) => {
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
149
|
+
var _a, _b;
|
|
150
|
+
// Issue #4104: same fix — no surrounding transaction, no trxMgr
|
|
151
|
+
// passed to controller methods.
|
|
152
|
+
const powrupController = new sales_base_1.PowrupController();
|
|
153
|
+
if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketPackCallSuccess) && !((_b = releaseGood.lastMileDelivery) === null || _b === void 0 ? void 0 : _b.isTms)) {
|
|
154
|
+
///// Q: why need to refetch Order Products?
|
|
155
|
+
const orderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
|
|
156
|
+
where: { releaseGood },
|
|
157
|
+
relations: ['product', 'productDetail']
|
|
158
|
+
});
|
|
159
|
+
await powrupController.packOrder(powrup, Object.assign(Object.assign({}, releaseGood), { orderProducts }), domain, user);
|
|
160
|
+
}
|
|
161
|
+
// Trigger if RTS Trigger Level Setting == 1
|
|
162
|
+
if (rtsTriggerLevel == 1)
|
|
163
|
+
await powrupController.initiateShipment(powrup, releaseGood, domain, user);
|
|
163
164
|
};
|
|
164
165
|
// asynchronouly call to initiate powrup order shipment/ RTS
|
|
165
166
|
initPowrupShipment(powrup, rtsTriggerLevel);
|
|
@@ -355,7 +356,10 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
355
356
|
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
356
357
|
});
|
|
357
358
|
if (sellercraft) {
|
|
358
|
-
|
|
359
|
+
// Issue #4104: bind to getManager() (auto-commit), not the
|
|
360
|
+
// outer @transaction `tx`, so marketplace HTTP calls don't
|
|
361
|
+
// hold row locks on order_packages.
|
|
362
|
+
const sellercraftCtrl = new controllers_1.SellercraftController((0, typeorm_1.getManager)(), null, null);
|
|
359
363
|
const rtsTriggerLevel = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
360
364
|
where: { domain: releaseGood.domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
361
365
|
});
|
|
@@ -372,7 +376,8 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
372
376
|
where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
373
377
|
});
|
|
374
378
|
if (rtsTriggerLevel && parseInt((rtsTriggerLevel === null || rtsTriggerLevel === void 0 ? void 0 : rtsTriggerLevel.value) || 0) == 1) {
|
|
375
|
-
|
|
379
|
+
// Issue #4104: don't pass `tx` — same reason as above.
|
|
380
|
+
powrupController.initiateShipment(powrup, releaseGood, domain, user);
|
|
376
381
|
}
|
|
377
382
|
}
|
|
378
383
|
}
|
|
@@ -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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.829",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"puppeteer": "21.0.3",
|
|
47
47
|
"uuid": "^9.0.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "d4911b8d536f211256b4c6b48bbf18c28cc9c099"
|
|
50
50
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Equal, getConnection, In, Not } from 'typeorm'
|
|
1
|
+
import { Equal, getConnection, getManager, In, Not } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { ApplicationType } from '@things-factory/auth-base'
|
|
4
4
|
import { logger } from '@things-factory/env'
|
|
@@ -116,7 +116,12 @@ export class PackingWorksheetController extends VasWorksheetController {
|
|
|
116
116
|
})
|
|
117
117
|
|
|
118
118
|
if (sellercraft) {
|
|
119
|
-
|
|
119
|
+
// Issue #4104: bind the controller to getManager() (auto-commit) instead
|
|
120
|
+
// of the outer this.trxMgr so the marketplace HTTP calls below don't
|
|
121
|
+
// hold row locks on order_packages, and so this fire-and-forget block
|
|
122
|
+
// doesn't reuse a transaction manager that's been closed by the time
|
|
123
|
+
// the await chain resumes.
|
|
124
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(getManager(), this.domain, this.user)
|
|
120
125
|
|
|
121
126
|
let rtsOrderDoc = async (sellercraft: any, releaseGood: any, domain: any, user: any) => {
|
|
122
127
|
try {
|
|
@@ -149,8 +154,10 @@ export class PackingWorksheetController extends VasWorksheetController {
|
|
|
149
154
|
|
|
150
155
|
let rtsOrderDoc = async (powrup: any, releaseGood: any, domain: any, user: any) => {
|
|
151
156
|
try {
|
|
152
|
-
//
|
|
153
|
-
|
|
157
|
+
// Issue #4104: don't pass this.trxMgr — Powrup's HTTP calls would
|
|
158
|
+
// otherwise hold row locks on order_packages across the API hop,
|
|
159
|
+
// and this fire-and-forget block can outlive the outer tx anyway.
|
|
160
|
+
await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user)
|
|
154
161
|
} catch (error) {
|
|
155
162
|
logger.error(
|
|
156
163
|
`packing-worksheet-controller[activatePacking]:(data:${JSON.stringify({
|
|
@@ -470,15 +477,15 @@ export class PackingWorksheetController extends VasWorksheetController {
|
|
|
470
477
|
`
|
|
471
478
|
UPDATE order_package_items tgt
|
|
472
479
|
SET
|
|
473
|
-
packed_qty = CASE
|
|
474
|
-
WHEN $5 = true THEN $4
|
|
475
|
-
ELSE coalesce(tgt.packed_qty, 0) + 1
|
|
480
|
+
packed_qty = CASE
|
|
481
|
+
WHEN $5 = true THEN $4
|
|
482
|
+
ELSE LEAST(coalesce(tgt.packed_qty, 0) + 1, tgt.release_qty)
|
|
476
483
|
END,
|
|
477
484
|
updated_at = $2,
|
|
478
485
|
updater_id = $3,
|
|
479
|
-
status = CASE
|
|
486
|
+
status = CASE
|
|
480
487
|
WHEN $5 = true AND $4 = release_qty THEN 'DONE'
|
|
481
|
-
WHEN $5 = false AND coalesce(tgt.packed_qty, 0) + 1 = release_qty THEN 'DONE'
|
|
488
|
+
WHEN $5 = false AND LEAST(coalesce(tgt.packed_qty, 0) + 1, tgt.release_qty) = release_qty THEN 'DONE'
|
|
482
489
|
ELSE tgt.status
|
|
483
490
|
END
|
|
484
491
|
WHERE id = $1
|
|
@@ -36,8 +36,10 @@ export const fetchPowrupDocumentResolver = {
|
|
|
36
36
|
try {
|
|
37
37
|
if (!orderPackage?.marketRtsCallSuccess) {
|
|
38
38
|
try {
|
|
39
|
-
//
|
|
40
|
-
|
|
39
|
+
// Issue #4104: don't pass `tx`. The Powrup HTTP call inside
|
|
40
|
+
// initiateShipment would otherwise hold row locks on
|
|
41
|
+
// order_packages for the duration of the API hop.
|
|
42
|
+
await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user)
|
|
41
43
|
} catch (error) {
|
|
42
44
|
console.log(`initiateShipment: ${error}`)
|
|
43
45
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EntityManager, getRepository } from 'typeorm'
|
|
1
|
+
import { EntityManager, getManager, getRepository } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
4
|
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
@@ -22,8 +22,9 @@ export const fetchSellercraftDocumentResolver = {
|
|
|
22
22
|
status: SellercraftStatus.ACTIVE
|
|
23
23
|
})
|
|
24
24
|
|
|
25
|
-
//
|
|
26
|
-
|
|
25
|
+
// Issue #4104: bind to getManager() (auto-commit) instead of `tx` so the
|
|
26
|
+
// Sellercraft HTTP calls below don't hold row locks on order_packages.
|
|
27
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(getManager(), domain, user)
|
|
27
28
|
|
|
28
29
|
try {
|
|
29
30
|
// fetch document if not found
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { EntityManager,
|
|
1
|
+
import { EntityManager, getRepository } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { ApplicationType, User } from '@things-factory/auth-base'
|
|
4
4
|
import { Bizplace, Company } from '@things-factory/biz-base'
|
|
5
5
|
import { Account } from '@things-factory/integration-accounting'
|
|
6
6
|
import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
|
|
7
7
|
import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
|
|
8
|
+
import { logger } from '@things-factory/env'
|
|
8
9
|
import { Powrup } from '@things-factory/integration-powrup'
|
|
9
10
|
import {
|
|
10
11
|
ORDER_INVENTORY_STATUS,
|
|
@@ -136,23 +137,33 @@ export async function completeLoading(
|
|
|
136
137
|
})
|
|
137
138
|
|
|
138
139
|
if (powrup && rtsTriggerLevel === 3) {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
140
|
+
// Issue #4104: PowrupAPI.initiateShipment / packOrder make external HTTP
|
|
141
|
+
// calls. Wrapping them in a transaction held row locks on order_packages
|
|
142
|
+
// for the duration of those HTTP calls. Run as fire-and-forget background
|
|
143
|
+
// work using the default (auto-commit) connection so each UPDATE
|
|
144
|
+
// releases its row lock immediately; partial failures are recovered by
|
|
145
|
+
// the `*-initiate-shipment` cron + marketRtsCallRetry flag.
|
|
146
|
+
;(async () => {
|
|
147
|
+
try {
|
|
148
|
+
const powrupController: PowrupController = new PowrupController()
|
|
149
|
+
|
|
150
|
+
const hasPackage =
|
|
151
|
+
(await getRepository(OrderPackage).count({ where: { releaseGood: { id: releaseGood.id } } })) > 0
|
|
152
|
+
|
|
153
|
+
if (!hasPackage && !releaseGood.marketPackCallSuccess) {
|
|
154
|
+
const orderProducts = await getRepository(OrderProduct).find({
|
|
155
|
+
where: { releaseGood: { id: releaseGood.id } },
|
|
156
|
+
relations: ['product', 'productDetail']
|
|
157
|
+
})
|
|
158
|
+
|
|
159
|
+
await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user)
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
await powrupController.initiateShipment(powrup, releaseGood, domain, user)
|
|
163
|
+
} catch (e) {
|
|
164
|
+
logger.error(`complete-loading[Powrup RTS background]: ${e}`)
|
|
152
165
|
}
|
|
153
|
-
|
|
154
|
-
await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr)
|
|
155
|
-
})
|
|
166
|
+
})()
|
|
156
167
|
}
|
|
157
168
|
break
|
|
158
169
|
|
|
@@ -402,68 +402,66 @@ export async function getTrackingNo(marketplaceStore, marketplaceOrderItems): Pr
|
|
|
402
402
|
return trackingNo
|
|
403
403
|
}
|
|
404
404
|
|
|
405
|
-
//trigger RTS, init document, and fetch sellercraft document
|
|
405
|
+
// Issue #4104: trigger RTS, init document, and fetch sellercraft document
|
|
406
|
+
// without wrapping the marketplace HTTP calls in a transaction. The previous
|
|
407
|
+
// version held row locks on order_packages for the entire HTTP duration.
|
|
406
408
|
async function getSellercraftDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood, domain: Domain, user: User) {
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
409
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(getManager(), domain, user)
|
|
410
|
+
try {
|
|
411
|
+
if (!releaseGood?.airwayBill) {
|
|
412
|
+
try {
|
|
413
|
+
// try fetch order document / AWB
|
|
414
|
+
releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
|
|
415
|
+
} catch (error) {
|
|
411
416
|
try {
|
|
412
|
-
//
|
|
413
|
-
|
|
417
|
+
// retry initiate order shipment / RTS
|
|
418
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
414
419
|
} catch (error) {
|
|
415
|
-
|
|
416
|
-
// retry initiate order shipment / RTS
|
|
417
|
-
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
418
|
-
} catch (error) {
|
|
419
|
-
throw new Error(`initiateOrderShipment: ${error}`)
|
|
420
|
-
}
|
|
421
|
-
throw new Error(`fetchOrderDocument: ${error}`)
|
|
420
|
+
throw new Error(`initiateOrderShipment: ${error}`)
|
|
422
421
|
}
|
|
422
|
+
throw new Error(`fetchOrderDocument: ${error}`)
|
|
423
423
|
}
|
|
424
|
-
} catch (error) {
|
|
425
|
-
logger.error(
|
|
426
|
-
`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({
|
|
427
|
-
sellercraft,
|
|
428
|
-
releaseGood,
|
|
429
|
-
domain,
|
|
430
|
-
user
|
|
431
|
-
})}) ${error} `
|
|
432
|
-
)
|
|
433
424
|
}
|
|
434
|
-
})
|
|
425
|
+
} catch (error) {
|
|
426
|
+
logger.error(
|
|
427
|
+
`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({
|
|
428
|
+
sellercraft,
|
|
429
|
+
releaseGood,
|
|
430
|
+
domain,
|
|
431
|
+
user
|
|
432
|
+
})}) ${error} `
|
|
433
|
+
)
|
|
434
|
+
}
|
|
435
435
|
}
|
|
436
436
|
|
|
437
|
-
//
|
|
437
|
+
// Issue #4104: same fix as getSellercraftDocument — no surrounding transaction.
|
|
438
438
|
async function getPowrupDocument(powrup: Powrup, releaseGood: ReleaseGood, domain: Domain, user: User) {
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
439
|
+
const powrupCtrl: PowrupController = new PowrupController()
|
|
440
|
+
try {
|
|
441
|
+
if (!releaseGood?.airwayBill) {
|
|
442
|
+
try {
|
|
443
|
+
// try fetch order document / AWB
|
|
444
|
+
releaseGood = await powrupCtrl.fetchDocument(powrup, releaseGood, domain, user)
|
|
445
|
+
} catch (error) {
|
|
443
446
|
try {
|
|
444
|
-
//
|
|
445
|
-
|
|
447
|
+
// retry initiate order shipment / RTS
|
|
448
|
+
await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user)
|
|
446
449
|
} catch (error) {
|
|
447
|
-
|
|
448
|
-
// retry initiate order shipment / RTS
|
|
449
|
-
await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, txMgr)
|
|
450
|
-
} catch (error) {
|
|
451
|
-
throw new Error(`initiateShipment: ${error}`)
|
|
452
|
-
}
|
|
453
|
-
throw new Error(`fetchDocument: ${error}`)
|
|
450
|
+
throw new Error(`initiateShipment: ${error}`)
|
|
454
451
|
}
|
|
452
|
+
throw new Error(`fetchDocument: ${error}`)
|
|
455
453
|
}
|
|
456
|
-
} catch (error) {
|
|
457
|
-
logger.error(
|
|
458
|
-
`packing-worksheet[getPowrupDocument]:(data:${JSON.stringify({
|
|
459
|
-
powrup,
|
|
460
|
-
releaseGood,
|
|
461
|
-
domain,
|
|
462
|
-
user
|
|
463
|
-
})}) ${error} `
|
|
464
|
-
)
|
|
465
454
|
}
|
|
466
|
-
})
|
|
455
|
+
} catch (error) {
|
|
456
|
+
logger.error(
|
|
457
|
+
`packing-worksheet[getPowrupDocument]:(data:${JSON.stringify({
|
|
458
|
+
powrup,
|
|
459
|
+
releaseGood,
|
|
460
|
+
domain,
|
|
461
|
+
user
|
|
462
|
+
})}) ${error} `
|
|
463
|
+
)
|
|
464
|
+
}
|
|
467
465
|
}
|
|
468
466
|
|
|
469
467
|
async function assignROFromBin(orderInventoriesByBin, domain, assignee, tx) {
|
|
@@ -156,17 +156,19 @@ export async function completeBatchPicking(
|
|
|
156
156
|
foundReleaseGood: ReleaseGood,
|
|
157
157
|
rtsTriggerLevel
|
|
158
158
|
) => {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
159
|
+
// Issue #4104: don't wrap marketplace HTTP calls in a
|
|
160
|
+
// transaction — bind the controller to getManager() (auto-
|
|
161
|
+
// commit) so order_packages row locks aren't held across the
|
|
162
|
+
// Sellercraft API hop.
|
|
163
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(getManager(), domain, user)
|
|
164
|
+
|
|
165
|
+
if (!foundReleaseGood?.orderPackages?.length && !foundReleaseGood?.marketPackCallSuccess) {
|
|
166
|
+
await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
|
|
167
|
+
}
|
|
165
168
|
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
})
|
|
169
|
+
if (rtsTriggerLevel == 1) {
|
|
170
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
|
|
171
|
+
}
|
|
170
172
|
}
|
|
171
173
|
|
|
172
174
|
// asynchronouly call to initiate sellercraft order shipment/ RTS
|
|
@@ -179,17 +181,17 @@ export async function completeBatchPicking(
|
|
|
179
181
|
|
|
180
182
|
if (powrup) {
|
|
181
183
|
const initPowrupShipment = async (powrup: Powrup, foundReleaseGood: ReleaseGood, rtsTriggerLevel) => {
|
|
182
|
-
|
|
183
|
-
|
|
184
|
+
// Issue #4104: same fix — no surrounding transaction, no trxMgr
|
|
185
|
+
// passed to the controller methods.
|
|
186
|
+
const powrupCtrl: PowrupController = new PowrupController()
|
|
184
187
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
+
if (!foundReleaseGood?.orderPackages?.length && !foundReleaseGood?.marketPackCallSuccess && !foundReleaseGood.lastMileDelivery?.isTms) {
|
|
189
|
+
await powrupCtrl.packOrder(powrup, foundReleaseGood, domain, user)
|
|
190
|
+
}
|
|
188
191
|
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
})
|
|
192
|
+
if (rtsTriggerLevel == 1) {
|
|
193
|
+
await powrupCtrl.initiateShipment(powrup, foundReleaseGood, domain, user)
|
|
194
|
+
}
|
|
193
195
|
}
|
|
194
196
|
|
|
195
197
|
// asynchronouly call to initiate sellercraft order shipment/ RTS
|
|
@@ -264,7 +266,10 @@ export async function completeBatchPicking(
|
|
|
264
266
|
status: SellercraftStatus.ACTIVE
|
|
265
267
|
})
|
|
266
268
|
if (sellercraft) {
|
|
267
|
-
|
|
269
|
+
// Issue #4104: bind to getManager() (auto-commit), not tx —
|
|
270
|
+
// marketplace HTTP calls would otherwise hold row locks on
|
|
271
|
+
// order_packages until the outer @transaction-resolver commits.
|
|
272
|
+
const sellercraftCtrl: SellercraftController = new SellercraftController(getManager(), null, null)
|
|
268
273
|
const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
|
|
269
274
|
where: { domain: foundReleaseGood.domain, category: 'id-rule', name: 'rts-trigger-level' }
|
|
270
275
|
})
|