@things-factory/operato-wms 4.3.828 → 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.
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.completeLoad = void 0;
4
4
  const typeorm_1 = require("typeorm");
5
+ const env_1 = require("@things-factory/env");
5
6
  const auth_base_1 = require("@things-factory/auth-base");
6
7
  const integration_accounting_1 = require("@things-factory/integration-accounting");
7
8
  const sales_base_1 = require("@things-factory/sales-base");
@@ -148,18 +149,31 @@ async function completeLoading(domain, tx, user, partial, orderId, worksheetId)
148
149
  return parseInt((setting === null || setting === void 0 ? void 0 : setting.value) || 0);
149
150
  });
150
151
  if (powrup && rtsTriggerLevel === 3) {
151
- (0, typeorm_1.getManager)().transaction(async (txMgr) => {
152
- const powrupController = new sales_base_1.PowrupController();
153
- const hasPackage = (await txMgr.getRepository(sales_base_1.OrderPackage).count({ where: { releaseGood: { id: releaseGood.id } } })) > 0;
154
- if (!hasPackage && !releaseGood.marketPackCallSuccess) {
155
- const orderProducts = await txMgr.getRepository(sales_base_1.OrderProduct).find({
156
- where: { releaseGood: { id: releaseGood.id } },
157
- relations: ['product', 'productDetail']
158
- });
159
- await powrupController.packOrder(powrup, Object.assign(Object.assign({}, releaseGood), { orderProducts }), domain, user, txMgr);
152
+ // Issue #4104: PowrupAPI.initiateShipment / packOrder make external HTTP
153
+ // calls. Wrapping them in a transaction held row locks on order_packages
154
+ // for the duration of those HTTP calls, producing multi-minute lock
155
+ // chains under load. Run as fire-and-forget background work using the
156
+ // default (auto-commit) connection so each UPDATE releases its row
157
+ // lock immediately; partial failures are recovered by the
158
+ // `*-initiate-shipment` cron + marketRtsCallRetry flag.
159
+ ;
160
+ (async () => {
161
+ try {
162
+ const powrupController = new sales_base_1.PowrupController();
163
+ const hasPackage = (await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).count({ where: { releaseGood: { id: releaseGood.id } } })) > 0;
164
+ if (!hasPackage && !releaseGood.marketPackCallSuccess) {
165
+ const orderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
166
+ where: { releaseGood: { id: releaseGood.id } },
167
+ relations: ['product', 'productDetail']
168
+ });
169
+ await powrupController.packOrder(powrup, Object.assign(Object.assign({}, releaseGood), { orderProducts }), domain, user);
170
+ }
171
+ await powrupController.initiateShipment(powrup, releaseGood, domain, user);
160
172
  }
161
- await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr);
162
- });
173
+ catch (e) {
174
+ env_1.logger.error(`complete-load[Powrup RTS background]: ${e}`);
175
+ }
176
+ })();
163
177
  }
164
178
  break;
165
179
  default:
@@ -1 +1 @@
1
- {"version":3,"file":"complete-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/complete-load.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"complete-load.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/complete-load.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-wms",
3
- "version": "4.3.828",
3
+ "version": "4.3.829",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -108,7 +108,7 @@
108
108
  "@things-factory/transport-base": "^4.3.819",
109
109
  "@things-factory/tutorial-ui": "^4.3.815",
110
110
  "@things-factory/warehouse-base": "^4.3.827",
111
- "@things-factory/worksheet-base": "^4.3.828"
111
+ "@things-factory/worksheet-base": "^4.3.829"
112
112
  },
113
113
  "devDependencies": {
114
114
  "@things-factory/builder": "^4.3.815",
@@ -117,5 +117,5 @@
117
117
  "cypress-localstorage-commands": "^1.6.1",
118
118
  "eslint-plugin-cypress": "^2.12.1"
119
119
  },
120
- "gitHead": "a86e3f4a1370adabfd4649d6ed66c9564f9228a5"
120
+ "gitHead": "d4911b8d536f211256b4c6b48bbf18c28cc9c099"
121
121
  }
@@ -1,5 +1,6 @@
1
- import { EntityManager, getManager, In } from 'typeorm'
1
+ import { EntityManager, getRepository, In } from 'typeorm'
2
2
  import { Domain } from '@things-factory/shell'
3
+ import { logger } from '@things-factory/env'
3
4
  import { ApplicationType, User } from '@things-factory/auth-base'
4
5
  import { Account } from '@things-factory/integration-accounting'
5
6
  import {
@@ -193,23 +194,34 @@ async function completeLoading(
193
194
  })
194
195
 
195
196
  if (powrup && rtsTriggerLevel === 3) {
196
- getManager().transaction(async txMgr => {
197
- const powrupController: PowrupController = new PowrupController()
198
-
199
- const hasPackage =
200
- (await txMgr.getRepository(OrderPackage).count({ where: { releaseGood: { id: releaseGood.id } } })) > 0
201
-
202
- if (!hasPackage && !releaseGood.marketPackCallSuccess) {
203
- const orderProducts = await txMgr.getRepository(OrderProduct).find({
204
- where: { releaseGood: { id: releaseGood.id } },
205
- relations: ['product', 'productDetail']
206
- })
207
-
208
- await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user, txMgr)
197
+ // Issue #4104: PowrupAPI.initiateShipment / packOrder make external HTTP
198
+ // calls. Wrapping them in a transaction held row locks on order_packages
199
+ // for the duration of those HTTP calls, producing multi-minute lock
200
+ // chains under load. Run as fire-and-forget background work using the
201
+ // default (auto-commit) connection so each UPDATE releases its row
202
+ // lock immediately; partial failures are recovered by the
203
+ // `*-initiate-shipment` cron + marketRtsCallRetry flag.
204
+ ;(async () => {
205
+ try {
206
+ const powrupController: PowrupController = new PowrupController()
207
+
208
+ const hasPackage =
209
+ (await getRepository(OrderPackage).count({ where: { releaseGood: { id: releaseGood.id } } })) > 0
210
+
211
+ if (!hasPackage && !releaseGood.marketPackCallSuccess) {
212
+ const orderProducts = await getRepository(OrderProduct).find({
213
+ where: { releaseGood: { id: releaseGood.id } },
214
+ relations: ['product', 'productDetail']
215
+ })
216
+
217
+ await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user)
218
+ }
219
+
220
+ await powrupController.initiateShipment(powrup, releaseGood, domain, user)
221
+ } catch (e) {
222
+ logger.error(`complete-load[Powrup RTS background]: ${e}`)
209
223
  }
210
-
211
- await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr)
212
- })
224
+ })()
213
225
  }
214
226
  break
215
227