@things-factory/operato-hub 4.3.440 → 4.3.441
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.
|
@@ -11,7 +11,7 @@ const sales_base_1 = require("@things-factory/sales-base");
|
|
|
11
11
|
const middlewares_1 = require("../middlewares");
|
|
12
12
|
const error_util_1 = require("../utils/error-util");
|
|
13
13
|
api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-list', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
|
|
14
|
-
var _a, _b;
|
|
14
|
+
var _a, _b, _c, _d;
|
|
15
15
|
try {
|
|
16
16
|
// get contact points for that bizplace
|
|
17
17
|
// optional query parameter filter
|
|
@@ -54,10 +54,10 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-list', middlewares_1.b
|
|
|
54
54
|
for (const orderProduct of draftReleaseGood.orderProducts) {
|
|
55
55
|
const orderProductsDataPoint = {
|
|
56
56
|
product: {
|
|
57
|
-
sku: orderProduct.product.sku
|
|
57
|
+
sku: (_a = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product) === null || _a === void 0 ? void 0 : _a.sku
|
|
58
58
|
},
|
|
59
59
|
productDetail: {
|
|
60
|
-
refCode: orderProduct.productDetail.refCode
|
|
60
|
+
refCode: (_b = orderProduct.productDetail) === null || _b === void 0 ? void 0 : _b.refCode
|
|
61
61
|
},
|
|
62
62
|
packingType: orderProduct.packingType,
|
|
63
63
|
releaseQty: orderProduct.releaseQty,
|
|
@@ -90,8 +90,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-list', middlewares_1.b
|
|
|
90
90
|
status: await draftReleaseGoodStatus(draftReleaseGood.bizplace.id, draftReleaseGood),
|
|
91
91
|
releaseGood: draftReleaseGood.releaseGood
|
|
92
92
|
? {
|
|
93
|
-
id: (
|
|
94
|
-
name: (
|
|
93
|
+
id: (_c = draftReleaseGood.releaseGood) === null || _c === void 0 ? void 0 : _c.id,
|
|
94
|
+
name: (_d = draftReleaseGood.releaseGood) === null || _d === void 0 ? void 0 : _d.name
|
|
95
95
|
}
|
|
96
96
|
: null,
|
|
97
97
|
billTo: {
|
|
@@ -178,14 +178,15 @@ async function draftReleaseGoodStatus(bizplaceId, draftReleaseGood) {
|
|
|
178
178
|
}
|
|
179
179
|
exports.draftReleaseGoodStatus = draftReleaseGoodStatus;
|
|
180
180
|
async function orderProductStatus(orderProduct, draftReleaseGood) {
|
|
181
|
+
var _a, _b;
|
|
181
182
|
let status;
|
|
182
183
|
let bizplaces = [draftReleaseGood.bizplace];
|
|
183
184
|
let productIds = [];
|
|
184
|
-
if (orderProduct.product.id) {
|
|
185
|
-
productIds.push(orderProduct.product.id);
|
|
185
|
+
if ((_a = orderProduct.product) === null || _a === void 0 ? void 0 : _a.id) {
|
|
186
|
+
productIds.push((_b = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product) === null || _b === void 0 ? void 0 : _b.id);
|
|
186
187
|
}
|
|
187
188
|
if (orderProduct.productBundleId || orderProduct.productBundleId !== null) {
|
|
188
|
-
productIds.push(orderProduct.productBundleId);
|
|
189
|
+
productIds.push(orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.productBundleId);
|
|
189
190
|
}
|
|
190
191
|
status = await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
191
192
|
let context = { state: { domain: { id: draftReleaseGood.domainId } } };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-draft-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-draft-order-list.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAsB;AACtB,
|
|
1
|
+
{"version":3,"file":"get-draft-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-draft-order-list.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.441",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -121,5 +121,5 @@
|
|
|
121
121
|
"resolutions": {
|
|
122
122
|
"core-js": "^3.16.0"
|
|
123
123
|
},
|
|
124
|
-
"gitHead": "
|
|
124
|
+
"gitHead": "61cdda504f7c2cd6241117334129c3249aeae8e2"
|
|
125
125
|
}
|
|
@@ -1,12 +1,30 @@
|
|
|
1
1
|
import _ from 'lodash'
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
Between,
|
|
4
|
+
EntityManager,
|
|
5
|
+
getConnection,
|
|
6
|
+
getRepository,
|
|
7
|
+
SelectQueryBuilder
|
|
8
|
+
} from 'typeorm'
|
|
3
9
|
|
|
4
10
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
5
11
|
import { Bizplace } from '@things-factory/biz-base'
|
|
6
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
DRAFT_RELEASE_ORDER_STATUS,
|
|
14
|
+
DraftReleaseGood,
|
|
15
|
+
InventoryUtil
|
|
16
|
+
} from '@things-factory/sales-base'
|
|
7
17
|
|
|
8
|
-
import {
|
|
9
|
-
|
|
18
|
+
import {
|
|
19
|
+
businessMiddleware,
|
|
20
|
+
loggingMiddleware,
|
|
21
|
+
validationMiddleware
|
|
22
|
+
} from '../middlewares'
|
|
23
|
+
import {
|
|
24
|
+
ApiError,
|
|
25
|
+
ApiErrorHandler,
|
|
26
|
+
throwInternalServerError
|
|
27
|
+
} from '../utils/error-util'
|
|
10
28
|
|
|
11
29
|
router.get(
|
|
12
30
|
'/v1/warehouse/get-draft-order-list',
|
|
@@ -64,10 +82,10 @@ router.get(
|
|
|
64
82
|
for (const orderProduct of draftReleaseGood.orderProducts) {
|
|
65
83
|
const orderProductsDataPoint = {
|
|
66
84
|
product: {
|
|
67
|
-
sku: orderProduct
|
|
85
|
+
sku: orderProduct?.product?.sku
|
|
68
86
|
},
|
|
69
87
|
productDetail: {
|
|
70
|
-
refCode: orderProduct.productDetail
|
|
88
|
+
refCode: orderProduct.productDetail?.refCode
|
|
71
89
|
},
|
|
72
90
|
packingType: orderProduct.packingType,
|
|
73
91
|
releaseQty: orderProduct.releaseQty,
|
|
@@ -202,11 +220,11 @@ export async function orderProductStatus(orderProduct, draftReleaseGood) {
|
|
|
202
220
|
let status
|
|
203
221
|
let bizplaces: Bizplace[] = [draftReleaseGood.bizplace]
|
|
204
222
|
let productIds = []
|
|
205
|
-
if (orderProduct.product
|
|
206
|
-
productIds.push(orderProduct
|
|
223
|
+
if (orderProduct.product?.id) {
|
|
224
|
+
productIds.push(orderProduct?.product?.id)
|
|
207
225
|
}
|
|
208
226
|
if (orderProduct.productBundleId || orderProduct.productBundleId !== null) {
|
|
209
|
-
productIds.push(orderProduct
|
|
227
|
+
productIds.push(orderProduct?.productBundleId)
|
|
210
228
|
}
|
|
211
229
|
|
|
212
230
|
status = await getConnection().transaction(async (tx: EntityManager) => {
|