@things-factory/sales-base 3.7.6 → 3.7.7
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/constants/order.js +9 -1
- package/dist-server/constants/order.js.map +1 -1
- package/dist-server/entities/index.js +4 -1
- package/dist-server/entities/index.js.map +1 -1
- package/dist-server/entities/manifest.js +100 -0
- package/dist-server/entities/manifest.js.map +1 -0
- package/dist-server/entities/order-inventory.js +4 -0
- package/dist-server/entities/order-inventory.js.map +1 -1
- package/dist-server/entities/order-reverse-kitting.js +7 -9
- package/dist-server/entities/order-reverse-kitting.js.map +1 -1
- package/dist-server/entities/release-good.js +22 -1
- package/dist-server/entities/release-good.js.map +1 -1
- package/dist-server/graphql/resolvers/arrival-notice/add-edit-arrival-notice-products.js +1 -1
- package/dist-server/graphql/resolvers/arrival-notice/add-edit-arrival-notice-products.js.map +1 -1
- package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js +37 -32
- package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js.map +1 -1
- package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js +20 -4
- package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js.map +1 -1
- package/dist-server/graphql/resolvers/goods-receival-note/goods-receival-notes.js +86 -43
- package/dist-server/graphql/resolvers/goods-receival-note/goods-receival-notes.js.map +1 -1
- package/dist-server/graphql/resolvers/index.js +7 -2
- package/dist-server/graphql/resolvers/index.js.map +1 -1
- package/dist-server/graphql/resolvers/manifest/delete-manifest.js +13 -0
- package/dist-server/graphql/resolvers/manifest/delete-manifest.js.map +1 -0
- package/dist-server/graphql/resolvers/manifest/dispatch-manifest.js +22 -0
- package/dist-server/graphql/resolvers/manifest/dispatch-manifest.js.map +1 -0
- package/dist-server/graphql/resolvers/manifest/generate-manifest.js +45 -0
- package/dist-server/graphql/resolvers/manifest/generate-manifest.js.map +1 -0
- package/dist-server/graphql/resolvers/manifest/index.js +11 -0
- package/dist-server/graphql/resolvers/manifest/index.js.map +1 -0
- package/dist-server/graphql/resolvers/manifest/manifest.js +25 -0
- package/dist-server/graphql/resolvers/manifest/manifest.js.map +1 -0
- package/dist-server/graphql/resolvers/manifest/manifests.js +36 -0
- package/dist-server/graphql/resolvers/manifest/manifests.js.map +1 -0
- package/dist-server/graphql/resolvers/order-inventory/index.js +2 -1
- package/dist-server/graphql/resolvers/order-inventory/index.js.map +1 -1
- package/dist-server/graphql/resolvers/order-inventory/order-inventory.js +3 -3
- package/dist-server/graphql/resolvers/order-inventory/order-inventory.js.map +1 -1
- package/dist-server/graphql/resolvers/order-inventory/update-order-inventories-serial-number.js +23 -0
- package/dist-server/graphql/resolvers/order-inventory/update-order-inventories-serial-number.js.map +1 -0
- package/dist-server/graphql/resolvers/order-reverse-kitting/index.js +2 -1
- package/dist-server/graphql/resolvers/order-reverse-kitting/index.js.map +1 -1
- package/dist-server/graphql/resolvers/order-reverse-kitting/update-order-reverse-kitting.js +20 -0
- package/dist-server/graphql/resolvers/order-reverse-kitting/update-order-reverse-kitting.js.map +1 -0
- package/dist-server/graphql/resolvers/release-good/release-good-requests.js +2 -2
- package/dist-server/graphql/resolvers/release-good/release-good-requests.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/cancel-reverse-kitting-order.js +9 -3
- package/dist-server/graphql/resolvers/reverse-kitting-order/cancel-reverse-kitting-order.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/complete-reverse-kitting-order.js +2 -0
- package/dist-server/graphql/resolvers/reverse-kitting-order/complete-reverse-kitting-order.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/delete-reverse-kitting-order.js +11 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/delete-reverse-kitting-order.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.js +1 -2
- package/dist-server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/generate-reverse-kitting-order.js +6 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/generate-reverse-kitting-order.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/generate-reverse-kitting-pallet-id.js +60 -0
- package/dist-server/graphql/resolvers/reverse-kitting-order/generate-reverse-kitting-pallet-id.js.map +1 -0
- package/dist-server/graphql/resolvers/reverse-kitting-order/index.js +3 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/index.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/reverse-kitting-inventories.js +9 -2
- package/dist-server/graphql/resolvers/reverse-kitting-order/reverse-kitting-inventories.js.map +1 -1
- package/dist-server/graphql/resolvers/reverse-kitting-order/undo-reverse-kitting-inventory.js +46 -0
- package/dist-server/graphql/resolvers/reverse-kitting-order/undo-reverse-kitting-inventory.js.map +1 -0
- package/dist-server/graphql/types/index.js +7 -3
- package/dist-server/graphql/types/index.js.map +1 -1
- package/dist-server/graphql/types/manifest/index.js +35 -0
- package/dist-server/graphql/types/manifest/index.js.map +1 -0
- package/dist-server/graphql/types/manifest/manifest-item.js +15 -0
- package/dist-server/graphql/types/manifest/manifest-item.js.map +1 -0
- package/dist-server/graphql/types/manifest/manifest-list.js +14 -0
- package/dist-server/graphql/types/manifest/manifest-list.js.map +1 -0
- package/dist-server/graphql/types/manifest/manifest-patch.js +19 -0
- package/dist-server/graphql/types/manifest/manifest-patch.js.map +1 -0
- package/dist-server/graphql/types/manifest/manifest.js +25 -0
- package/dist-server/graphql/types/manifest/manifest.js.map +1 -0
- package/dist-server/graphql/types/manifest/new-manifest.js +13 -0
- package/dist-server/graphql/types/manifest/new-manifest.js.map +1 -0
- package/dist-server/graphql/types/manifest/tracking-no.js +20 -0
- package/dist-server/graphql/types/manifest/tracking-no.js.map +1 -0
- package/dist-server/graphql/types/order-inventory/index.js +5 -1
- package/dist-server/graphql/types/order-inventory/index.js.map +1 -1
- package/dist-server/graphql/types/order-inventory/new-order-inventory.js +1 -0
- package/dist-server/graphql/types/order-inventory/new-order-inventory.js.map +1 -1
- package/dist-server/graphql/types/order-inventory/order-inventory-patch.js +1 -0
- package/dist-server/graphql/types/order-inventory/order-inventory-patch.js.map +1 -1
- package/dist-server/graphql/types/order-inventory/order-inventory.js +1 -0
- package/dist-server/graphql/types/order-inventory/order-inventory.js.map +1 -1
- package/dist-server/graphql/types/order-reverse-kitting/index.js +6 -1
- package/dist-server/graphql/types/order-reverse-kitting/index.js.map +1 -1
- package/dist-server/graphql/types/order-reverse-kitting/new-order-reverse-kitting.js +1 -0
- package/dist-server/graphql/types/order-reverse-kitting/new-order-reverse-kitting.js.map +1 -1
- package/dist-server/graphql/types/order-reverse-kitting/order-reverse-kitting-patch.js +1 -0
- package/dist-server/graphql/types/order-reverse-kitting/order-reverse-kitting-patch.js.map +1 -1
- package/dist-server/graphql/types/order-reverse-kitting/order-reverse-kitting.js +1 -0
- package/dist-server/graphql/types/order-reverse-kitting/order-reverse-kitting.js.map +1 -1
- package/dist-server/graphql/types/release-good/release-good-detail.js +1 -0
- package/dist-server/graphql/types/release-good/release-good-detail.js.map +1 -1
- package/dist-server/graphql/types/release-good/release-good.js +2 -0
- package/dist-server/graphql/types/release-good/release-good.js.map +1 -1
- package/dist-server/graphql/types/reverse-kitting-order/index.js +8 -1
- package/dist-server/graphql/types/reverse-kitting-order/index.js.map +1 -1
- package/dist-server/utils/order-no-generator.js +35 -31
- package/dist-server/utils/order-no-generator.js.map +1 -1
- package/package.json +4 -4
- package/server/constants/order.ts +10 -0
- package/server/entities/index.ts +3 -0
- package/server/entities/manifest.ts +79 -0
- package/server/entities/order-inventory.ts +3 -0
- package/server/entities/order-reverse-kitting.ts +6 -9
- package/server/entities/release-good.ts +29 -1
- package/server/graphql/resolvers/arrival-notice/add-edit-arrival-notice-products.ts +3 -1
- package/server/graphql/resolvers/arrival-notice/arrival-notice.ts +47 -43
- package/server/graphql/resolvers/delivery-order/delivery-orders.ts +27 -5
- package/server/graphql/resolvers/goods-receival-note/goods-receival-notes.ts +105 -47
- package/server/graphql/resolvers/index.ts +7 -2
- package/server/graphql/resolvers/manifest/delete-manifest.ts +13 -0
- package/server/graphql/resolvers/manifest/dispatch-manifest.ts +34 -0
- package/server/graphql/resolvers/manifest/generate-manifest.ts +50 -0
- package/server/graphql/resolvers/manifest/index.ts +16 -0
- package/server/graphql/resolvers/manifest/manifest.ts +28 -0
- package/server/graphql/resolvers/manifest/manifests.ts +43 -0
- package/server/graphql/resolvers/order-inventory/index.ts +3 -1
- package/server/graphql/resolvers/order-inventory/order-inventory.ts +3 -3
- package/server/graphql/resolvers/order-inventory/update-order-inventories-serial-number.ts +28 -0
- package/server/graphql/resolvers/order-reverse-kitting/index.ts +4 -1
- package/server/graphql/resolvers/order-reverse-kitting/update-order-reverse-kitting.ts +26 -0
- package/server/graphql/resolvers/release-good/release-good-requests.ts +2 -2
- package/server/graphql/resolvers/reverse-kitting-order/cancel-reverse-kitting-order.ts +18 -4
- package/server/graphql/resolvers/reverse-kitting-order/complete-reverse-kitting-order.ts +2 -0
- package/server/graphql/resolvers/reverse-kitting-order/delete-reverse-kitting-order.ts +19 -1
- package/server/graphql/resolvers/reverse-kitting-order/execute-reverse-kitting.ts +1 -2
- package/server/graphql/resolvers/reverse-kitting-order/generate-reverse-kitting-order.ts +8 -1
- package/server/graphql/resolvers/reverse-kitting-order/generate-reverse-kitting-pallet-id.ts +71 -0
- package/server/graphql/resolvers/reverse-kitting-order/index.ts +5 -1
- package/server/graphql/resolvers/reverse-kitting-order/reverse-kitting-inventories.ts +12 -2
- package/server/graphql/resolvers/reverse-kitting-order/undo-reverse-kitting-inventory.ts +70 -0
- package/server/graphql/types/index.ts +7 -3
- package/server/graphql/types/manifest/index.ts +34 -0
- package/server/graphql/types/manifest/manifest-item.ts +9 -0
- package/server/graphql/types/manifest/manifest-list.ts +8 -0
- package/server/graphql/types/manifest/manifest-patch.ts +13 -0
- package/server/graphql/types/manifest/manifest.ts +19 -0
- package/server/graphql/types/manifest/new-manifest.ts +7 -0
- package/server/graphql/types/manifest/tracking-no.ts +14 -0
- package/server/graphql/types/order-inventory/index.ts +5 -1
- package/server/graphql/types/order-inventory/new-order-inventory.ts +1 -0
- package/server/graphql/types/order-inventory/order-inventory-patch.ts +1 -0
- package/server/graphql/types/order-inventory/order-inventory.ts +1 -0
- package/server/graphql/types/order-reverse-kitting/index.ts +6 -1
- package/server/graphql/types/order-reverse-kitting/new-order-reverse-kitting.ts +1 -0
- package/server/graphql/types/order-reverse-kitting/order-reverse-kitting-patch.ts +1 -0
- package/server/graphql/types/order-reverse-kitting/order-reverse-kitting.ts +1 -0
- package/server/graphql/types/release-good/release-good-detail.ts +1 -0
- package/server/graphql/types/release-good/release-good.ts +2 -0
- package/server/graphql/types/reverse-kitting-order/index.ts +8 -1
- package/server/utils/order-no-generator.ts +43 -36
|
@@ -5,7 +5,12 @@ const new_order_reverse_kitting_1 = require("./new-order-reverse-kitting");
|
|
|
5
5
|
const order_reverse_kitting_1 = require("./order-reverse-kitting");
|
|
6
6
|
const order_reverse_kitting_list_1 = require("./order-reverse-kitting-list");
|
|
7
7
|
const order_reverse_kitting_patch_1 = require("./order-reverse-kitting-patch");
|
|
8
|
-
exports.Mutation =
|
|
8
|
+
exports.Mutation = `
|
|
9
|
+
updateOrderReverseKitting (
|
|
10
|
+
id: String!
|
|
11
|
+
patch: OrderReverseKittingPatch!
|
|
12
|
+
): OrderReverseKitting @transaction
|
|
13
|
+
`;
|
|
9
14
|
exports.Query = `
|
|
10
15
|
orderReverseKittings(filters: [Filter], pagination: Pagination, sortings: [Sorting]): OrderReverseKittingList
|
|
11
16
|
orderReverseKitting(reverseKitting: ObjectRef!, name: String!): OrderReverseKitting
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/index.ts"],"names":[],"mappings":";;;AAAA,2EAAoE;AACpE,mEAA6D;AAC7D,6EAAsE;AACtE,+EAAwE;AAE3D,QAAA,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/index.ts"],"names":[],"mappings":";;;AAAA,2EAAoE;AACpE,mEAA6D;AAC7D,6EAAsE;AACtE,+EAAwE;AAE3D,QAAA,QAAQ,GAAG;;;;;CAKvB,CAAA;AAEY,QAAA,KAAK,GAAG;;;CAGpB,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,2CAAmB,EAAE,kDAAsB,EAAE,sDAAwB,EAAE,oDAAuB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-order-reverse-kitting.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/new-order-reverse-kitting.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"new-order-reverse-kitting.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/new-order-reverse-kitting.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;CAuBxC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-reverse-kitting-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/order-reverse-kitting-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"order-reverse-kitting-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/order-reverse-kitting-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;CAwB1C,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-reverse-kitting.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/order-reverse-kitting.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,mBAAmB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"order-reverse-kitting.js","sourceRoot":"","sources":["../../../../server/graphql/types/order-reverse-kitting/order-reverse-kitting.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,mBAAmB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BrC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-good-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/release-good-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,iBAAiB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"release-good-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/release-good-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,iBAAiB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DnC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-good.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/release-good.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,WAAW,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"release-good.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/release-good.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,WAAW,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+D7B,CAAA"}
|
|
@@ -34,14 +34,21 @@ exports.Mutation = `
|
|
|
34
34
|
completeReverseKittingOrder (
|
|
35
35
|
name: String!
|
|
36
36
|
): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
37
|
+
|
|
38
|
+
undoReverseKittingInventory (
|
|
39
|
+
orderReverseKittingName: String!
|
|
40
|
+
palletId: String!
|
|
41
|
+
): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
37
42
|
`;
|
|
38
43
|
exports.Query = `
|
|
39
44
|
reverseKittingOrders(filters: [Filter], pagination: Pagination, sortings: [Sorting]): ReverseKittingOrderList
|
|
40
45
|
reverseKittingOrder(name: String!): ReverseKittingOrder
|
|
41
46
|
executingReverseKittingOrder(name: String!): ReverseKittingOrder
|
|
42
47
|
reverseKittingInventories (
|
|
43
|
-
orderReverseKittingName: String
|
|
48
|
+
orderReverseKittingName: String!,
|
|
49
|
+
productDetailId: String
|
|
44
50
|
): [Inventory]
|
|
51
|
+
generateReverseKittingPalletId(targets: [PalletInfo], type: String!): [InventoryDetail] @transaction
|
|
45
52
|
`;
|
|
46
53
|
exports.Types = [reverse_kitting_order_1.ReverseKittingOrder, new_reverse_kitting_order_1.NewReverseKittingOrder, reverse_kitting_order_patch_1.ReverseKittingOrderPatch, reverse_kitting_order_list_1.ReverseKittingOrderList];
|
|
47
54
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/reverse-kitting-order/index.ts"],"names":[],"mappings":";;;AAAA,2EAAoE;AACpE,mEAA6D;AAC7D,6EAAsE;AACtE,+EAAwE;AAE3D,QAAA,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/reverse-kitting-order/index.ts"],"names":[],"mappings":";;;AAAA,2EAAoE;AACpE,mEAA6D;AAC7D,6EAAsE;AACtE,+EAAwE;AAE3D,QAAA,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCvB,CAAA;AAEY,QAAA,KAAK,GAAG;;;;;;;;;CASpB,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,2CAAmB,EAAE,kDAAsB,EAAE,sDAAwB,EAAE,oDAAuB,CAAC,CAAA"}
|
|
@@ -10,70 +10,74 @@ class OrderNoGenerator {
|
|
|
10
10
|
const currentDate = new Date();
|
|
11
11
|
return `GAN-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
12
12
|
}
|
|
13
|
-
static
|
|
14
|
-
const currentDate = new Date();
|
|
15
|
-
return `PO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
16
|
-
}
|
|
17
|
-
static jobSheet(domainName) {
|
|
18
|
-
const currentDate = new Date();
|
|
19
|
-
return `${domainName}-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
20
|
-
}
|
|
21
|
-
static goodsReceiveNote() {
|
|
13
|
+
static collectionOrder() {
|
|
22
14
|
const currentDate = new Date();
|
|
23
|
-
return `
|
|
15
|
+
return `CO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
24
16
|
}
|
|
25
17
|
static cycleCount() {
|
|
26
18
|
const currentDate = new Date();
|
|
27
19
|
return `CC-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
28
20
|
}
|
|
29
|
-
static
|
|
21
|
+
static deliveryOrder() {
|
|
30
22
|
const currentDate = new Date();
|
|
31
|
-
return `
|
|
23
|
+
return `DO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
32
24
|
}
|
|
33
|
-
static
|
|
25
|
+
static goodsReceiveNote() {
|
|
34
26
|
const currentDate = new Date();
|
|
35
|
-
return `
|
|
27
|
+
return `GRN-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
36
28
|
}
|
|
37
|
-
static
|
|
29
|
+
static jobSheet(domainName) {
|
|
38
30
|
const currentDate = new Date();
|
|
39
|
-
return
|
|
31
|
+
return `${domainName}-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
40
32
|
}
|
|
41
|
-
static
|
|
33
|
+
static manifest() {
|
|
42
34
|
const currentDate = new Date();
|
|
43
|
-
return `
|
|
35
|
+
return `LM-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
36
|
+
}
|
|
37
|
+
static orderInventory() {
|
|
38
|
+
return (0, v4_1.default)();
|
|
44
39
|
}
|
|
45
40
|
static orderProduct() {
|
|
46
41
|
return `OP-${(0, v4_1.default)()}`;
|
|
47
42
|
}
|
|
48
|
-
static
|
|
49
|
-
|
|
50
|
-
return `CO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
43
|
+
static orderVas() {
|
|
44
|
+
return `OV-${(0, v4_1.default)()}`;
|
|
51
45
|
}
|
|
52
|
-
static
|
|
46
|
+
static purchaseOrder() {
|
|
53
47
|
const currentDate = new Date();
|
|
54
|
-
return `
|
|
48
|
+
return `PO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
55
49
|
}
|
|
56
|
-
static
|
|
57
|
-
|
|
50
|
+
static releaseGood() {
|
|
51
|
+
const currentDate = new Date();
|
|
52
|
+
return `RO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
58
53
|
}
|
|
59
54
|
static releaseVas() {
|
|
60
55
|
return (0, v4_1.default)();
|
|
61
56
|
}
|
|
62
|
-
static
|
|
57
|
+
static retailReplenishmentOrder() {
|
|
63
58
|
const currentDate = new Date();
|
|
64
|
-
return `
|
|
59
|
+
return `RR-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
65
60
|
}
|
|
66
|
-
static
|
|
67
|
-
|
|
61
|
+
static returnOrder() {
|
|
62
|
+
const currentDate = new Date();
|
|
63
|
+
return `RTO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
68
64
|
}
|
|
69
|
-
static
|
|
65
|
+
static shippingOrder() {
|
|
70
66
|
const currentDate = new Date();
|
|
71
|
-
return `
|
|
67
|
+
return `SO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
68
|
+
}
|
|
69
|
+
static stockTake() {
|
|
70
|
+
const currentDate = new Date();
|
|
71
|
+
return `ST-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
72
72
|
}
|
|
73
73
|
static transferOrder() {
|
|
74
74
|
const currentDate = new Date();
|
|
75
75
|
return `TO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
76
76
|
}
|
|
77
|
+
static vasOrder() {
|
|
78
|
+
const currentDate = new Date();
|
|
79
|
+
return `VO-${currentDate.getFullYear()}${currentDate.getMonth() + 1}${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`;
|
|
80
|
+
}
|
|
77
81
|
}
|
|
78
82
|
exports.OrderNoGenerator = OrderNoGenerator;
|
|
79
83
|
//# sourceMappingURL=order-no-generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-no-generator.js","sourceRoot":"","sources":["../../server/utils/order-no-generator.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA0B;AAE1B,MAAa,gBAAgB;IAC3B,MAAM,CAAC,aAAa;QAClB,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAA;QAC9B,OAAO,OAAO,WAAW,CAAC,WAAW,EAAE,GACrC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAC3B,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,QAAQ,EAAE,GAAG,WAAW,CAAC,UAAU,EAAE,GAAG,WAAW,CAAC,UAAU,EAAE,GAAG,WAAW,CAAC,eAAe,EAAE,EAAE,CAAA;IAC3I,CAAC;IAED,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"order-no-generator.js","sourceRoot":"","sources":["../../server/utils/order-no-generator.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": "3.7.
|
|
3
|
+
"version": "3.7.7",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"@things-factory/biz-base": "^3.7.5",
|
|
30
30
|
"@things-factory/code-base": "^3.7.5",
|
|
31
31
|
"@things-factory/notification": "^3.7.5",
|
|
32
|
-
"@things-factory/product-base": "^3.7.
|
|
32
|
+
"@things-factory/product-base": "^3.7.7",
|
|
33
33
|
"@things-factory/setting-base": "^3.7.5",
|
|
34
34
|
"@things-factory/shell": "^3.7.5",
|
|
35
35
|
"@things-factory/transport-base": "^3.7.5",
|
|
36
|
-
"@things-factory/warehouse-base": "^3.7.
|
|
36
|
+
"@things-factory/warehouse-base": "^3.7.7"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "7e1cfc771ca9e8970d90493d3049d4d589e96f08"
|
|
39
39
|
}
|
|
@@ -38,6 +38,16 @@ export const ORDER_STATUS = {
|
|
|
38
38
|
PARTIAL_RECEIVED: 'PARTIAL_RECEIVED'
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
+
export const DISPATCHMENT_STATUS = {
|
|
42
|
+
READY_TO_DISPATCH: 'READY_TO_DISPATCH',
|
|
43
|
+
DISPATCHED: 'DISPATCHED'
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export const MANIFEST_STATUS = {
|
|
47
|
+
OPEN: 'OPEN',
|
|
48
|
+
CLOSED: 'CLOSED'
|
|
49
|
+
}
|
|
50
|
+
|
|
41
51
|
export const ORDER_INVENTORY_TYPE = {
|
|
42
52
|
RELEASE_OF_GOODS: 'RELEASE_OF_GOODS',
|
|
43
53
|
ARRIVAL_NOTICE: 'ARRIVAL_NOTICE',
|
package/server/entities/index.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Manifest } from './manifest'
|
|
1
2
|
import { ArrivalNotice } from './arrival-notice'
|
|
2
3
|
import { Claim } from './claim'
|
|
3
4
|
import { ClaimDetail } from './claim-detail'
|
|
@@ -24,6 +25,7 @@ import { Vas } from './vas'
|
|
|
24
25
|
import { VasOrder } from './vas-order'
|
|
25
26
|
|
|
26
27
|
export const entities = [
|
|
28
|
+
Manifest,
|
|
27
29
|
PurchaseOrderOtherCharge,
|
|
28
30
|
ArrivalNotice,
|
|
29
31
|
OrderProduct,
|
|
@@ -51,6 +53,7 @@ export const entities = [
|
|
|
51
53
|
]
|
|
52
54
|
|
|
53
55
|
export {
|
|
56
|
+
Manifest,
|
|
54
57
|
ArrivalNotice,
|
|
55
58
|
Claim,
|
|
56
59
|
ClaimDetail,
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import {
|
|
2
|
+
Column,
|
|
3
|
+
CreateDateColumn,
|
|
4
|
+
Entity,
|
|
5
|
+
Index,
|
|
6
|
+
ManyToOne,
|
|
7
|
+
PrimaryGeneratedColumn,
|
|
8
|
+
RelationId,
|
|
9
|
+
UpdateDateColumn
|
|
10
|
+
} from 'typeorm'
|
|
11
|
+
|
|
12
|
+
import { User } from '@things-factory/auth-base'
|
|
13
|
+
import { config } from '@things-factory/env'
|
|
14
|
+
import { Domain } from '@things-factory/shell'
|
|
15
|
+
|
|
16
|
+
const ORMCONFIG = config.get('ormconfig', {})
|
|
17
|
+
const DATABASE_TYPE = ORMCONFIG.type
|
|
18
|
+
|
|
19
|
+
export enum ManifestStatus {
|
|
20
|
+
OPEN = 'OPEN',
|
|
21
|
+
CLOSED = 'CLOSED'
|
|
22
|
+
}
|
|
23
|
+
@Entity()
|
|
24
|
+
@Index('ix_manifest_0', (manifest: Manifest) => [manifest.domain, manifest.name], { unique: true })
|
|
25
|
+
export class Manifest {
|
|
26
|
+
@PrimaryGeneratedColumn('uuid')
|
|
27
|
+
id: string
|
|
28
|
+
|
|
29
|
+
@ManyToOne(type => Domain)
|
|
30
|
+
domain: Domain
|
|
31
|
+
|
|
32
|
+
@RelationId((manifest: Manifest) => manifest.domain)
|
|
33
|
+
domainId: string
|
|
34
|
+
|
|
35
|
+
@Column()
|
|
36
|
+
name: string
|
|
37
|
+
|
|
38
|
+
@Column({ nullable: true })
|
|
39
|
+
shippingProvider: string
|
|
40
|
+
|
|
41
|
+
@Column({ nullable: true })
|
|
42
|
+
dispatcherName: string
|
|
43
|
+
|
|
44
|
+
@Column({ nullable: true })
|
|
45
|
+
dispatcherIdentity: string
|
|
46
|
+
|
|
47
|
+
@Column({ nullable: true })
|
|
48
|
+
dispatchedAt: Date
|
|
49
|
+
|
|
50
|
+
@Column({
|
|
51
|
+
type:
|
|
52
|
+
DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
53
|
+
? 'enum'
|
|
54
|
+
: DATABASE_TYPE == 'oracle'
|
|
55
|
+
? 'varchar2'
|
|
56
|
+
: 'smallint',
|
|
57
|
+
enum: ManifestStatus,
|
|
58
|
+
default: ManifestStatus.OPEN
|
|
59
|
+
})
|
|
60
|
+
status: ManifestStatus
|
|
61
|
+
|
|
62
|
+
@CreateDateColumn()
|
|
63
|
+
createdAt: Date
|
|
64
|
+
|
|
65
|
+
@UpdateDateColumn()
|
|
66
|
+
updatedAt: Date
|
|
67
|
+
|
|
68
|
+
@ManyToOne(type => User, { nullable: true })
|
|
69
|
+
creator: User
|
|
70
|
+
|
|
71
|
+
@RelationId((manifest: Manifest) => manifest.creator)
|
|
72
|
+
creatorId: string
|
|
73
|
+
|
|
74
|
+
@ManyToOne(type => User, { nullable: true })
|
|
75
|
+
updater: User
|
|
76
|
+
|
|
77
|
+
@RelationId((manifest: Manifest) => manifest.updater)
|
|
78
|
+
updaterId: string
|
|
79
|
+
}
|
|
@@ -84,21 +84,18 @@ export class OrderReverseKitting {
|
|
|
84
84
|
@ManyToOne(type => Inventory, { nullable: true })
|
|
85
85
|
inventory: Inventory
|
|
86
86
|
|
|
87
|
-
@Column({
|
|
88
|
-
nullable: true
|
|
89
|
-
})
|
|
87
|
+
@Column({ nullable: true })
|
|
90
88
|
type: string
|
|
91
89
|
|
|
92
|
-
@Column({
|
|
93
|
-
nullable: true
|
|
94
|
-
})
|
|
90
|
+
@Column({ nullable: true })
|
|
95
91
|
remark: string
|
|
96
92
|
|
|
97
|
-
@Column({
|
|
98
|
-
nullable: true
|
|
99
|
-
})
|
|
93
|
+
@Column({ nullable: true })
|
|
100
94
|
description: string
|
|
101
95
|
|
|
96
|
+
@Column({ nullable: true })
|
|
97
|
+
issue: string
|
|
98
|
+
|
|
102
99
|
@Column()
|
|
103
100
|
status: string
|
|
104
101
|
|
|
@@ -16,7 +16,15 @@ import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
|
16
16
|
import { config } from '@things-factory/env'
|
|
17
17
|
import { Domain } from '@things-factory/shell'
|
|
18
18
|
|
|
19
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
ArrivalNotice,
|
|
21
|
+
DeliveryOrder,
|
|
22
|
+
Manifest,
|
|
23
|
+
OrderInventory,
|
|
24
|
+
OrderProduct,
|
|
25
|
+
OrderVas,
|
|
26
|
+
ShippingOrder
|
|
27
|
+
} from '../entities'
|
|
20
28
|
|
|
21
29
|
const ORMCONFIG = config.get('ormconfig', {})
|
|
22
30
|
const DATABASE_TYPE = ORMCONFIG.type
|
|
@@ -25,6 +33,11 @@ export enum ReleaseOrderType {
|
|
|
25
33
|
B2B = 'b2b',
|
|
26
34
|
B2C = 'b2c'
|
|
27
35
|
}
|
|
36
|
+
|
|
37
|
+
export enum DispatchmentStatus {
|
|
38
|
+
READY_TO_DISPATCH = 'READY_TO_DISPATCH',
|
|
39
|
+
DISPATCHED = 'DISPATCHED'
|
|
40
|
+
}
|
|
28
41
|
@Entity()
|
|
29
42
|
@Index('ix_release-good_0', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.name], { unique: true })
|
|
30
43
|
export class ReleaseGood {
|
|
@@ -37,6 +50,9 @@ export class ReleaseGood {
|
|
|
37
50
|
@ManyToOne(type => Bizplace)
|
|
38
51
|
bizplace: Bizplace
|
|
39
52
|
|
|
53
|
+
@ManyToOne(type => Manifest)
|
|
54
|
+
manifest: Manifest
|
|
55
|
+
|
|
40
56
|
@Column({ nullable: true })
|
|
41
57
|
name: string
|
|
42
58
|
|
|
@@ -98,6 +114,18 @@ export class ReleaseGood {
|
|
|
98
114
|
@Column()
|
|
99
115
|
status: string
|
|
100
116
|
|
|
117
|
+
@Column({
|
|
118
|
+
type:
|
|
119
|
+
DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
120
|
+
? 'enum'
|
|
121
|
+
: DATABASE_TYPE == 'oracle'
|
|
122
|
+
? 'varchar2'
|
|
123
|
+
: 'smallint',
|
|
124
|
+
enum: DispatchmentStatus,
|
|
125
|
+
default: DispatchmentStatus.READY_TO_DISPATCH
|
|
126
|
+
})
|
|
127
|
+
dispatchmentStatus: DispatchmentStatus
|
|
128
|
+
|
|
101
129
|
@Column({ nullable: true })
|
|
102
130
|
releaseDateTime: Date
|
|
103
131
|
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { EntityManager, getRepository, Repository } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { User } from '@things-factory/auth-base'
|
|
2
4
|
import { getDomainUsers } from '@things-factory/biz-base'
|
|
3
5
|
import { sendNotification } from '@things-factory/notification'
|
|
4
6
|
import { Product } from '@things-factory/product-base'
|
|
5
7
|
import { Domain } from '@things-factory/shell'
|
|
8
|
+
|
|
6
9
|
import { ORDER_PRODUCT_STATUS, ORDER_STATUS } from '../../../constants'
|
|
7
|
-
import { EntityManager, getRepository, Repository } from 'typeorm'
|
|
8
10
|
import { ArrivalNotice, OrderProduct } from '../../../entities'
|
|
9
11
|
import { OrderNoGenerator } from '../../../utils'
|
|
10
12
|
|
|
@@ -44,57 +44,61 @@ export const arrivalNoticeResolver = {
|
|
|
44
44
|
|
|
45
45
|
if (name && !foundGAN) throw new Error(`Failed to find arrival notice with ${name}`)
|
|
46
46
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const foundPOAttachments: Attachment[] = foundGAN?.purchaseOrder?.id
|
|
56
|
-
? await getRepository(Attachment).find({
|
|
57
|
-
where: {
|
|
58
|
-
domain,
|
|
59
|
-
refBy: foundGAN.purchaseOrder?.id,
|
|
60
|
-
category: ATTACHMENT_TYPE.PO
|
|
61
|
-
}
|
|
62
|
-
})
|
|
63
|
-
: []
|
|
64
|
-
|
|
65
|
-
// add productDetails data to orderProduct.product
|
|
66
|
-
foundGAN.orderProducts = await Promise.all(
|
|
67
|
-
foundGAN.orderProducts.map(async (orderProduct: OrderProduct) => {
|
|
68
|
-
orderProduct.product['productDetails'] = await getRepository(ProductDetail).find({
|
|
69
|
-
where: {
|
|
70
|
-
product: orderProduct.product.id,
|
|
71
|
-
packingType: orderProduct.packingType,
|
|
72
|
-
packingSize: orderProduct.packingSize
|
|
73
|
-
}
|
|
74
|
-
})
|
|
75
|
-
return orderProduct
|
|
47
|
+
if (foundGAN) {
|
|
48
|
+
const foundAttachments: Attachment[] = await getRepository(Attachment).find({
|
|
49
|
+
where: {
|
|
50
|
+
domain,
|
|
51
|
+
refBy: foundGAN?.id,
|
|
52
|
+
category: ATTACHMENT_TYPE.GAN
|
|
53
|
+
}
|
|
76
54
|
})
|
|
77
|
-
)
|
|
78
55
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
foundGAN.orderInventories = await Promise.all(
|
|
82
|
-
foundGAN.orderInventories.map(async (orderInventory: OrderInventory) => {
|
|
83
|
-
orderInventory.inventory.product['productDetails'] = await getRepository(ProductDetail).find({
|
|
56
|
+
const foundPOAttachments: Attachment[] = foundGAN?.purchaseOrder?.id
|
|
57
|
+
? await getRepository(Attachment).find({
|
|
84
58
|
where: {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
59
|
+
domain,
|
|
60
|
+
refBy: foundGAN.purchaseOrder?.id,
|
|
61
|
+
category: ATTACHMENT_TYPE.PO
|
|
88
62
|
}
|
|
89
63
|
})
|
|
90
|
-
|
|
64
|
+
: []
|
|
65
|
+
|
|
66
|
+
// add productDetails data to orderProduct.product
|
|
67
|
+
foundGAN.orderProducts = await Promise.all(
|
|
68
|
+
foundGAN.orderProducts.map(async (orderProduct: OrderProduct) => {
|
|
69
|
+
orderProduct.product['productDetails'] = await getRepository(ProductDetail).find({
|
|
70
|
+
where: {
|
|
71
|
+
product: orderProduct.product.id,
|
|
72
|
+
packingType: orderProduct.packingType,
|
|
73
|
+
packingSize: orderProduct.packingSize
|
|
74
|
+
}
|
|
75
|
+
})
|
|
76
|
+
return orderProduct
|
|
91
77
|
})
|
|
92
78
|
)
|
|
93
|
-
}
|
|
94
79
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
80
|
+
// add productDetails data to orderInventory.inventory.product if orderInventory is exist
|
|
81
|
+
if (foundGAN.orderInventories && foundGAN.orderInventories.length) {
|
|
82
|
+
foundGAN.orderInventories = await Promise.all(
|
|
83
|
+
foundGAN.orderInventories.map(async (orderInventory: OrderInventory) => {
|
|
84
|
+
orderInventory.inventory.product['productDetails'] = await getRepository(ProductDetail).find({
|
|
85
|
+
where: {
|
|
86
|
+
product: orderInventory.inventory.product.id,
|
|
87
|
+
packingType: orderInventory.inventory.packingType,
|
|
88
|
+
packingSize: orderInventory.inventory.packingSize
|
|
89
|
+
}
|
|
90
|
+
})
|
|
91
|
+
return orderInventory
|
|
92
|
+
})
|
|
93
|
+
)
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
return {
|
|
97
|
+
...foundGAN,
|
|
98
|
+
attachment: [...foundPOAttachments, ...foundAttachments]
|
|
99
|
+
}
|
|
100
|
+
} else {
|
|
101
|
+
return {}
|
|
98
102
|
}
|
|
99
103
|
}
|
|
100
104
|
}
|