@things-factory/worksheet-base 3.7.11 → 3.7.15
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/graphql/resolvers/worksheet/inventories-by-pallet.js +3 -3
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js +6 -3
- package/dist-server/graphql/resolvers/worksheet/pending-cancellation-release-order.js.map +1 -1
- package/package.json +5 -5
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +4 -3
- package/server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts +13 -7
|
@@ -38,9 +38,9 @@ exports.inventoriesByPalletResolver = {
|
|
|
38
38
|
.andWhere('iv.qty > 0')
|
|
39
39
|
.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
|
|
40
40
|
.andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
|
|
41
|
-
.andWhere(`(iv.batch_id, product.name, iv.packing_type) NOT IN (
|
|
41
|
+
.andWhere(`(iv.batch_id, product.name, iv.packing_type, product.brand) NOT IN (
|
|
42
42
|
SELECT
|
|
43
|
-
oi.batch_id, p2.name, oi.packing_type
|
|
43
|
+
oi.batch_id, p2.name, oi.packing_type, p2.brand
|
|
44
44
|
FROM
|
|
45
45
|
order_inventories oi
|
|
46
46
|
LEFT JOIN
|
|
@@ -79,7 +79,7 @@ exports.inventoriesByPalletResolver = {
|
|
|
79
79
|
return Object.assign(Object.assign({}, item), { remainQty,
|
|
80
80
|
remainUomValue, remainUomValueWithUom: remainUomValue + ' ' + item.uom,
|
|
81
81
|
// product: item.product,
|
|
82
|
-
productName: item.product.name, productSKU: item.product.sku });
|
|
82
|
+
productName: item.product.name, productSKU: item.product.sku, productBrand: item.product.brand });
|
|
83
83
|
}));
|
|
84
84
|
return { items, total };
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.pendingCancellationReleaseOrder = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const notification_1 = require("@things-factory/notification");
|
|
6
|
-
const typeorm_1 = require("typeorm");
|
|
7
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
8
|
const entities_1 = require("../../../entities");
|
|
9
9
|
exports.pendingCancellationReleaseOrder = {
|
|
@@ -31,11 +31,14 @@ exports.pendingCancellationReleaseOrder = {
|
|
|
31
31
|
});
|
|
32
32
|
await tx.getRepository(sales_base_1.OrderInventory).save(pickedOIs);
|
|
33
33
|
}
|
|
34
|
-
else if (foundRO.status === sales_base_1.ORDER_STATUS.PICKING ||
|
|
34
|
+
else if (foundRO.status === sales_base_1.ORDER_STATUS.PICKING ||
|
|
35
|
+
foundRO.status === sales_base_1.ORDER_STATUS.READY_TO_PICK ||
|
|
36
|
+
foundRO.status === sales_base_1.ORDER_STATUS.PENDING_WORKSHEET) {
|
|
35
37
|
pickingOIs = targetOIs
|
|
36
38
|
.filter((oi) => oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKING ||
|
|
37
39
|
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK ||
|
|
38
|
-
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT
|
|
40
|
+
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT ||
|
|
41
|
+
oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET)
|
|
39
42
|
.map((targetOI) => {
|
|
40
43
|
return Object.assign(Object.assign({}, targetOI), { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL, updater: user });
|
|
41
44
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pending-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"pending-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/pending-cancellation-release-order.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": "3.7.
|
|
3
|
+
"version": "3.7.15",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"@things-factory/integration-lmd": "^3.7.11",
|
|
32
32
|
"@things-factory/integration-marketplace": "^3.7.11",
|
|
33
33
|
"@things-factory/integration-sellercraft": "^3.7.7",
|
|
34
|
-
"@things-factory/marketplace-base": "^3.7.
|
|
34
|
+
"@things-factory/marketplace-base": "^3.7.15",
|
|
35
35
|
"@things-factory/notification": "^3.7.5",
|
|
36
|
-
"@things-factory/sales-base": "^3.7.
|
|
36
|
+
"@things-factory/sales-base": "^3.7.15",
|
|
37
37
|
"@things-factory/setting-base": "^3.7.5",
|
|
38
38
|
"@things-factory/shell": "^3.7.5",
|
|
39
39
|
"@things-factory/transport-base": "^3.7.5",
|
|
40
|
-
"@things-factory/warehouse-base": "^3.7.
|
|
40
|
+
"@things-factory/warehouse-base": "^3.7.15"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "5f9af9a29afa1e43536817aa9e7a63e0c38908ed"
|
|
43
43
|
}
|
|
@@ -42,9 +42,9 @@ export const inventoriesByPalletResolver = {
|
|
|
42
42
|
.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
|
|
43
43
|
.andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
|
|
44
44
|
.andWhere(
|
|
45
|
-
`(iv.batch_id, product.name, iv.packing_type) NOT IN (
|
|
45
|
+
`(iv.batch_id, product.name, iv.packing_type, product.brand) NOT IN (
|
|
46
46
|
SELECT
|
|
47
|
-
oi.batch_id, p2.name, oi.packing_type
|
|
47
|
+
oi.batch_id, p2.name, oi.packing_type, p2.brand
|
|
48
48
|
FROM
|
|
49
49
|
order_inventories oi
|
|
50
50
|
LEFT JOIN
|
|
@@ -112,7 +112,8 @@ export const inventoriesByPalletResolver = {
|
|
|
112
112
|
remainUomValueWithUom: remainUomValue + ' ' + item.uom,
|
|
113
113
|
// product: item.product,
|
|
114
114
|
productName: item.product.name,
|
|
115
|
-
productSKU: item.product.sku
|
|
115
|
+
productSKU: item.product.sku,
|
|
116
|
+
productBrand: item.product.brand
|
|
116
117
|
}
|
|
117
118
|
})
|
|
118
119
|
)
|
|
@@ -1,18 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
import {
|
|
1
|
+
import { EntityManager, In } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { Role, User } from '@things-factory/auth-base'
|
|
4
4
|
import { Bizplace } from '@things-factory/biz-base'
|
|
5
5
|
import { sendNotification } from '@things-factory/notification'
|
|
6
|
-
import { EntityManager, In } from 'typeorm'
|
|
7
6
|
import {
|
|
7
|
+
DeliveryOrder,
|
|
8
8
|
ORDER_INVENTORY_STATUS,
|
|
9
9
|
ORDER_STATUS,
|
|
10
10
|
ORDER_VAS_STATUS,
|
|
11
11
|
OrderInventory,
|
|
12
|
-
DeliveryOrder,
|
|
13
12
|
OrderVas,
|
|
14
13
|
ReleaseGood
|
|
15
14
|
} from '@things-factory/sales-base'
|
|
15
|
+
import { Domain } from '@things-factory/shell'
|
|
16
|
+
|
|
16
17
|
import { Worksheet, WorksheetDetail } from '../../../entities'
|
|
17
18
|
|
|
18
19
|
export const pendingCancellationReleaseOrder = {
|
|
@@ -46,13 +47,18 @@ export const pendingCancellationReleaseOrder = {
|
|
|
46
47
|
}
|
|
47
48
|
})
|
|
48
49
|
await tx.getRepository(OrderInventory).save(pickedOIs)
|
|
49
|
-
} else if (
|
|
50
|
+
} else if (
|
|
51
|
+
foundRO.status === ORDER_STATUS.PICKING ||
|
|
52
|
+
foundRO.status === ORDER_STATUS.READY_TO_PICK ||
|
|
53
|
+
foundRO.status === ORDER_STATUS.PENDING_WORKSHEET
|
|
54
|
+
) {
|
|
50
55
|
pickingOIs = targetOIs
|
|
51
56
|
.filter(
|
|
52
57
|
(oi: OrderInventory) =>
|
|
53
58
|
oi.status === ORDER_INVENTORY_STATUS.PICKING ||
|
|
54
59
|
oi.status === ORDER_INVENTORY_STATUS.READY_TO_PICK ||
|
|
55
|
-
oi.status === ORDER_INVENTORY_STATUS.PENDING_SPLIT
|
|
60
|
+
oi.status === ORDER_INVENTORY_STATUS.PENDING_SPLIT ||
|
|
61
|
+
oi.status === ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
|
|
56
62
|
)
|
|
57
63
|
.map((targetOI: OrderInventory) => {
|
|
58
64
|
return {
|