@things-factory/sales-base 4.3.518 → 4.3.520
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.
|
@@ -8,7 +8,6 @@ const constants_1 = require("../../constants");
|
|
|
8
8
|
const service_1 = require("../../service");
|
|
9
9
|
const utils_1 = require("@things-factory/utils");
|
|
10
10
|
const utils_2 = require("../../utils");
|
|
11
|
-
// const { PerformanceObserver, performance } = require('node:perf_hooks')
|
|
12
11
|
class WebspertController {
|
|
13
12
|
static async packOrder(releaseGood, domain, user) {
|
|
14
13
|
await (0, typeorm_1.getConnection)().transaction(async (trx) => {
|
|
@@ -42,7 +41,7 @@ class WebspertController {
|
|
|
42
41
|
let roUpdateFields = null;
|
|
43
42
|
let releaseOrder = await trx.getRepository(service_1.ReleaseGood).findOne({
|
|
44
43
|
where: { id: releaseGood.id, domain },
|
|
45
|
-
relations: ['bizplace', 'domain', 'orderProducts', 'orderProducts.productDetail']
|
|
44
|
+
relations: ['bizplace', 'domain', 'orderProducts', 'orderProducts.productDetail', 'orderProducts.productDetail.product']
|
|
46
45
|
});
|
|
47
46
|
if (releaseOrder) {
|
|
48
47
|
try {
|
|
@@ -161,19 +160,19 @@ async function generatePackage(releaseGood, packages, user, trxMgr) {
|
|
|
161
160
|
}
|
|
162
161
|
let orderPackageItems = await trxMgr.getRepository(service_1.OrderPackageItem).find({
|
|
163
162
|
where: { orderPackage },
|
|
164
|
-
relations: ['productDetail']
|
|
163
|
+
relations: ['productDetail', 'productDetail.product']
|
|
165
164
|
});
|
|
166
165
|
orderPackageItems = items.map(itm => {
|
|
167
166
|
const { sku, qty } = itm;
|
|
168
167
|
if (!sku) {
|
|
169
168
|
throw new Error(`universalIdentifier missing`);
|
|
170
169
|
}
|
|
171
|
-
const matchedOrderPackageItem = orderPackageItems.find(op => op.productDetail.
|
|
170
|
+
const matchedOrderPackageItem = orderPackageItems.find(op => op.productDetail.product.sku == sku && op.releaseQty == qty);
|
|
172
171
|
if (matchedOrderPackageItem) {
|
|
173
172
|
return matchedOrderPackageItem;
|
|
174
173
|
}
|
|
175
174
|
else {
|
|
176
|
-
const matchedOrderProduct = releaseGood.orderProducts.find(op => op.productDetail.
|
|
175
|
+
const matchedOrderProduct = releaseGood.orderProducts.find(op => op.productDetail.product.sku == sku);
|
|
177
176
|
return {
|
|
178
177
|
name: utils_2.OrderNoGenerator.orderPackageItem(),
|
|
179
178
|
orderProduct: matchedOrderProduct,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webspert-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/webspert-controller.ts"],"names":[],"mappings":";;;AAAA,qCAAqE;AAErE,6CAA4C;AAI5C,mEAA6F;AAE7F,+CAA8C;AAC9C,2CAAyF;AAEzF,iDAA6C;AAC7C,uCAA8C;AAE9C,
|
|
1
|
+
{"version":3,"file":"webspert-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/webspert-controller.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.520",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"@things-factory/setting-base": "^4.3.518",
|
|
37
37
|
"@things-factory/shell": "^4.3.434",
|
|
38
38
|
"@things-factory/transport-base": "^4.3.518",
|
|
39
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
39
|
+
"@things-factory/warehouse-base": "^4.3.520",
|
|
40
40
|
"axios": "1.7.7"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "5b8fa6d6bef3ece5265eef8b11afb8942b74ca05"
|
|
43
43
|
}
|
|
@@ -12,8 +12,6 @@ import { ReleaseGood, OrderProduct, OrderPackageItem, OrderPackage } from '../..
|
|
|
12
12
|
import { sleep } from '@things-factory/utils'
|
|
13
13
|
import { OrderNoGenerator } from '../../utils'
|
|
14
14
|
|
|
15
|
-
// const { PerformanceObserver, performance } = require('node:perf_hooks')
|
|
16
|
-
|
|
17
15
|
export class WebspertController {
|
|
18
16
|
public static async packOrder(
|
|
19
17
|
releaseGood: ReleaseGood,
|
|
@@ -63,7 +61,7 @@ export class WebspertController {
|
|
|
63
61
|
|
|
64
62
|
let releaseOrder = await trx.getRepository(ReleaseGood).findOne({
|
|
65
63
|
where: { id: releaseGood.id, domain },
|
|
66
|
-
relations: ['bizplace', 'domain', 'orderProducts', 'orderProducts.productDetail']
|
|
64
|
+
relations: ['bizplace', 'domain', 'orderProducts', 'orderProducts.productDetail', 'orderProducts.productDetail.product']
|
|
67
65
|
})
|
|
68
66
|
|
|
69
67
|
if (releaseOrder) {
|
|
@@ -229,7 +227,7 @@ async function generatePackage(
|
|
|
229
227
|
|
|
230
228
|
let orderPackageItems: OrderPackageItem[] = await trxMgr.getRepository(OrderPackageItem).find({
|
|
231
229
|
where: { orderPackage },
|
|
232
|
-
relations: ['productDetail']
|
|
230
|
+
relations: ['productDetail', 'productDetail.product']
|
|
233
231
|
})
|
|
234
232
|
|
|
235
233
|
orderPackageItems = items.map(itm => {
|
|
@@ -237,12 +235,12 @@ async function generatePackage(
|
|
|
237
235
|
if (!sku) {
|
|
238
236
|
throw new Error(`universalIdentifier missing`)
|
|
239
237
|
}
|
|
240
|
-
const matchedOrderPackageItem: OrderPackageItem = orderPackageItems.find(op => op.productDetail.
|
|
238
|
+
const matchedOrderPackageItem: OrderPackageItem = orderPackageItems.find(op => op.productDetail.product.sku == sku && op.releaseQty == qty)
|
|
241
239
|
|
|
242
240
|
if (matchedOrderPackageItem) {
|
|
243
241
|
return matchedOrderPackageItem
|
|
244
242
|
} else {
|
|
245
|
-
const matchedOrderProduct: OrderProduct = releaseGood.orderProducts.find(op => op.productDetail.
|
|
243
|
+
const matchedOrderProduct: OrderProduct = releaseGood.orderProducts.find(op => op.productDetail.product.sku == sku)
|
|
246
244
|
return {
|
|
247
245
|
name: OrderNoGenerator.orderPackageItem(),
|
|
248
246
|
orderProduct: matchedOrderProduct,
|