@things-factory/sales-base 4.3.0 → 4.4.0-alpha.0
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/attachment-type.js +1 -2
- package/dist-server/constants/attachment-type.js.map +1 -1
- package/dist-server/constants/index.js +5 -2
- package/dist-server/constants/index.js.map +1 -1
- package/dist-server/constants/order.js +3 -12
- package/dist-server/constants/order.js.map +1 -1
- package/dist-server/controllers/ecommerce/index.js +5 -1
- package/dist-server/controllers/ecommerce/index.js.map +1 -1
- package/dist-server/controllers/index.js +5 -1
- package/dist-server/controllers/index.js.map +1 -1
- package/dist-server/errors/index.js +5 -1
- package/dist-server/errors/index.js.map +1 -1
- package/dist-server/errors/validation-error.js +5 -1
- package/dist-server/errors/validation-error.js.map +1 -1
- package/dist-server/index.js +5 -1
- package/dist-server/index.js.map +1 -1
- package/dist-server/service/arrival-notice/index.js +5 -1
- package/dist-server/service/arrival-notice/index.js.map +1 -1
- package/dist-server/service/claim/index.js +5 -1
- package/dist-server/service/claim/index.js.map +1 -1
- package/dist-server/service/claim-detail/index.js +5 -1
- package/dist-server/service/claim-detail/index.js.map +1 -1
- package/dist-server/service/claim-order/index.js +5 -1
- package/dist-server/service/claim-order/index.js.map +1 -1
- package/dist-server/service/collection-order/index.js +5 -1
- package/dist-server/service/collection-order/index.js.map +1 -1
- package/dist-server/service/delivery-order/index.js +5 -1
- package/dist-server/service/delivery-order/index.js.map +1 -1
- package/dist-server/service/goods-receival-note/index.js +5 -1
- package/dist-server/service/goods-receival-note/index.js.map +1 -1
- package/dist-server/service/index.js +24 -48
- package/dist-server/service/index.js.map +1 -1
- package/dist-server/service/inventory-check/index.js +5 -1
- package/dist-server/service/inventory-check/index.js.map +1 -1
- package/dist-server/service/invoice/index.js +5 -1
- package/dist-server/service/invoice/index.js.map +1 -1
- package/dist-server/service/invoice-product/index.js +5 -1
- package/dist-server/service/invoice-product/index.js.map +1 -1
- package/dist-server/service/job-sheet/index.js +5 -1
- package/dist-server/service/job-sheet/index.js.map +1 -1
- package/dist-server/service/order-inventory/index.js +5 -1
- package/dist-server/service/order-inventory/index.js.map +1 -1
- package/dist-server/service/order-inventory/order-inventory-query.js +1 -38
- package/dist-server/service/order-inventory/order-inventory-query.js.map +1 -1
- package/dist-server/service/order-inventory/order-inventory-types.js +1 -9
- package/dist-server/service/order-inventory/order-inventory-types.js.map +1 -1
- package/dist-server/service/order-inventory/order-inventory.js +1 -5
- package/dist-server/service/order-inventory/order-inventory.js.map +1 -1
- package/dist-server/service/order-product/index.js +5 -1
- package/dist-server/service/order-product/index.js.map +1 -1
- package/dist-server/service/order-product/order-product-types.js +13 -13
- package/dist-server/service/order-product/order-product-types.js.map +1 -1
- package/dist-server/service/order-product/order-product.js +4 -39
- package/dist-server/service/order-product/order-product.js.map +1 -1
- package/dist-server/service/order-vas/index.js +5 -1
- package/dist-server/service/order-vas/index.js.map +1 -1
- package/dist-server/service/others/index.js +5 -1
- package/dist-server/service/others/index.js.map +1 -1
- package/dist-server/service/others/other-query.js +2 -37
- package/dist-server/service/others/other-query.js.map +1 -1
- package/dist-server/service/purchase-order/index.js +5 -1
- package/dist-server/service/purchase-order/index.js.map +1 -1
- package/dist-server/service/purchase-order-other-charge/index.js +5 -1
- package/dist-server/service/purchase-order-other-charge/index.js.map +1 -1
- package/dist-server/service/release-good/index.js +5 -1
- package/dist-server/service/release-good/index.js.map +1 -1
- package/dist-server/service/release-good/release-good-mutation.js +1 -23
- package/dist-server/service/release-good/release-good-mutation.js.map +1 -1
- package/dist-server/service/release-good/release-good-query.js +2 -28
- package/dist-server/service/release-good/release-good-query.js.map +1 -1
- package/dist-server/service/release-good/release-good.js +12 -32
- package/dist-server/service/release-good/release-good.js.map +1 -1
- package/dist-server/service/retail-replenishment-order/index.js +5 -1
- package/dist-server/service/retail-replenishment-order/index.js.map +1 -1
- package/dist-server/service/return-order/index.js +5 -1
- package/dist-server/service/return-order/index.js.map +1 -1
- package/dist-server/service/reverse-kitting-order/index.js +5 -1
- package/dist-server/service/reverse-kitting-order/index.js.map +1 -1
- package/dist-server/service/reverse-kitting-order-inventory/index.js +5 -1
- package/dist-server/service/reverse-kitting-order-inventory/index.js.map +1 -1
- package/dist-server/service/shipping-order/index.js +5 -1
- package/dist-server/service/shipping-order/index.js.map +1 -1
- package/dist-server/service/transfer-order/index.js +5 -1
- package/dist-server/service/transfer-order/index.js.map +1 -1
- package/dist-server/service/vas/index.js +5 -1
- package/dist-server/service/vas/index.js.map +1 -1
- package/dist-server/service/vas-order/index.js +5 -1
- package/dist-server/service/vas-order/index.js.map +1 -1
- package/dist-server/utils/index.js +5 -1
- package/dist-server/utils/index.js.map +1 -1
- package/dist-server/utils/inventory-util.js +99 -258
- package/dist-server/utils/inventory-util.js.map +1 -1
- package/dist-server/utils/order-no-generator.js +0 -7
- package/dist-server/utils/order-no-generator.js.map +1 -1
- package/package.json +13 -13
- package/server/constants/attachment-type.ts +1 -2
- package/server/constants/index.ts +0 -1
- package/server/constants/order.ts +2 -12
- package/server/service/index.ts +21 -51
- package/server/service/order-inventory/order-inventory-query.ts +2 -40
- package/server/service/order-inventory/order-inventory-types.ts +0 -6
- package/server/service/order-inventory/order-inventory.ts +5 -5
- package/server/service/order-product/order-product-types.ts +3 -5
- package/server/service/order-product/order-product.ts +3 -30
- package/server/service/others/other-query.ts +8 -43
- package/server/service/release-good/release-good-mutation.ts +2 -24
- package/server/service/release-good/release-good-query.ts +30 -57
- package/server/service/release-good/release-good.ts +9 -28
- package/server/utils/inventory-util.ts +106 -287
- package/server/utils/order-no-generator.ts +48 -42
- package/dist-server/constants/release-good.js +0 -9
- package/dist-server/constants/release-good.js.map +0 -1
- package/dist-server/service/draft-release-good/draft-release-good-mutation.js +0 -501
- package/dist-server/service/draft-release-good/draft-release-good-mutation.js.map +0 -1
- package/dist-server/service/draft-release-good/draft-release-good-query.js +0 -289
- package/dist-server/service/draft-release-good/draft-release-good-query.js.map +0 -1
- package/dist-server/service/draft-release-good/draft-release-good-type.js +0 -364
- package/dist-server/service/draft-release-good/draft-release-good-type.js.map +0 -1
- package/dist-server/service/draft-release-good/draft-release-good.js +0 -321
- package/dist-server/service/draft-release-good/draft-release-good.js.map +0 -1
- package/dist-server/service/draft-release-good/index.js +0 -21
- package/dist-server/service/draft-release-good/index.js.map +0 -1
- package/dist-server/service/order-tote/index.js +0 -21
- package/dist-server/service/order-tote/index.js.map +0 -1
- package/dist-server/service/order-tote/order-tote-mutation.js +0 -56
- package/dist-server/service/order-tote/order-tote-mutation.js.map +0 -1
- package/dist-server/service/order-tote/order-tote-query.js +0 -123
- package/dist-server/service/order-tote/order-tote-query.js.map +0 -1
- package/dist-server/service/order-tote/order-tote-types.js +0 -79
- package/dist-server/service/order-tote/order-tote-types.js.map +0 -1
- package/dist-server/service/order-tote/order-tote.js +0 -91
- package/dist-server/service/order-tote/order-tote.js.map +0 -1
- package/dist-server/service/order-tote-item/index.js +0 -21
- package/dist-server/service/order-tote-item/index.js.map +0 -1
- package/dist-server/service/order-tote-item/order-tote-item-mutation.js +0 -56
- package/dist-server/service/order-tote-item/order-tote-item-mutation.js.map +0 -1
- package/dist-server/service/order-tote-item/order-tote-item-query.js +0 -100
- package/dist-server/service/order-tote-item/order-tote-item-query.js.map +0 -1
- package/dist-server/service/order-tote-item/order-tote-item-types.js +0 -91
- package/dist-server/service/order-tote-item/order-tote-item-types.js.map +0 -1
- package/dist-server/service/order-tote-item/order-tote-item.js +0 -104
- package/dist-server/service/order-tote-item/order-tote-item.js.map +0 -1
- package/dist-server/service/order-tote-seal/index.js +0 -21
- package/dist-server/service/order-tote-seal/index.js.map +0 -1
- package/dist-server/service/order-tote-seal/order-tote-seal-mutation.js +0 -56
- package/dist-server/service/order-tote-seal/order-tote-seal-mutation.js.map +0 -1
- package/dist-server/service/order-tote-seal/order-tote-seal-query.js +0 -97
- package/dist-server/service/order-tote-seal/order-tote-seal-query.js.map +0 -1
- package/dist-server/service/order-tote-seal/order-tote-seal-types.js +0 -71
- package/dist-server/service/order-tote-seal/order-tote-seal-types.js.map +0 -1
- package/dist-server/service/order-tote-seal/order-tote-seal.js +0 -71
- package/dist-server/service/order-tote-seal/order-tote-seal.js.map +0 -1
- package/server/constants/release-good.ts +0 -6
- package/server/service/draft-release-good/draft-release-good-mutation.ts +0 -671
- package/server/service/draft-release-good/draft-release-good-query.ts +0 -314
- package/server/service/draft-release-good/draft-release-good-type.ts +0 -261
- package/server/service/draft-release-good/draft-release-good.ts +0 -270
- package/server/service/draft-release-good/index.ts +0 -9
- package/server/service/order-tote/index.ts +0 -9
- package/server/service/order-tote/order-tote-mutation.ts +0 -30
- package/server/service/order-tote/order-tote-query.ts +0 -114
- package/server/service/order-tote/order-tote-types.ts +0 -47
- package/server/service/order-tote/order-tote.ts +0 -62
- package/server/service/order-tote-item/index.ts +0 -9
- package/server/service/order-tote-item/order-tote-item-mutation.ts +0 -30
- package/server/service/order-tote-item/order-tote-item-query.ts +0 -88
- package/server/service/order-tote-item/order-tote-item-types.ts +0 -56
- package/server/service/order-tote-item/order-tote-item.ts +0 -72
- package/server/service/order-tote-seal/index.ts +0 -9
- package/server/service/order-tote-seal/order-tote-seal-mutation.ts +0 -30
- package/server/service/order-tote-seal/order-tote-seal-query.ts +0 -60
- package/server/service/order-tote-seal/order-tote-seal-types.ts +0 -41
- package/server/service/order-tote-seal/order-tote-seal.ts +0 -46
|
@@ -148,7 +148,6 @@ export const ORDER_TYPES = {
|
|
|
148
148
|
DELIVERY: 'DELIVERY',
|
|
149
149
|
COLLECTION: 'COLLECTION',
|
|
150
150
|
RELEASE_OF_GOODS: 'RELEASE_OF_GOODS',
|
|
151
|
-
DRAFT_RELEASE_GOODS: 'DRAFT_RELEASE_GOODS',
|
|
152
151
|
VAS_ORDER: 'VAS_ORDER',
|
|
153
152
|
CYCLE_COUNT: 'CYCLE_COUNT',
|
|
154
153
|
STOCK_TAKE: 'STOCK_TAKE',
|
|
@@ -169,8 +168,7 @@ export const ORDER_NUMBER_SETTING_KEY = {
|
|
|
169
168
|
RO_NUMBER_RULE: 'ro-number-rule',
|
|
170
169
|
DO_NUMBER_RULE: 'do-number-rule',
|
|
171
170
|
RR_NUMBER_RULE: 'rr-number-rule',
|
|
172
|
-
TO_NUMBER_RULE: 'to-number-rule'
|
|
173
|
-
DRO_NUMBER_RULE: 'dro-number-rule'
|
|
171
|
+
TO_NUMBER_RULE: 'to-number-rule'
|
|
174
172
|
}
|
|
175
173
|
|
|
176
174
|
export const ORDER_NUMBER_RULE_TYPE = {
|
|
@@ -180,8 +178,7 @@ export const ORDER_NUMBER_RULE_TYPE = {
|
|
|
180
178
|
RO_NUMBER: 'ro_number',
|
|
181
179
|
DO_NUMBER: 'do_number',
|
|
182
180
|
RR_NUMBER: 'rr_number',
|
|
183
|
-
TO_NUMBER: 'to_number'
|
|
184
|
-
DRO_NUMBER: 'dro_number'
|
|
181
|
+
TO_NUMBER: 'to_number'
|
|
185
182
|
}
|
|
186
183
|
|
|
187
184
|
export const PURCHASE_ORDER_STATUS = {
|
|
@@ -191,10 +188,3 @@ export const PURCHASE_ORDER_STATUS = {
|
|
|
191
188
|
REJECTED: 'REJECTED',
|
|
192
189
|
COMPLETED: 'COMPLETED'
|
|
193
190
|
}
|
|
194
|
-
|
|
195
|
-
export const DRAFT_RELEASE_ORDER_STATUS = {
|
|
196
|
-
DRAFT: 'DRAFT',
|
|
197
|
-
INSUFFICIENT: 'INSUFFICIENT',
|
|
198
|
-
SUBMITTED: 'SUBMITTED',
|
|
199
|
-
CANCELLED: 'CANCELLED'
|
|
200
|
-
}
|
package/server/service/index.ts
CHANGED
|
@@ -10,7 +10,6 @@ import { entities as InvoiceEntity, resolvers as InvoiceResolvers } from './invo
|
|
|
10
10
|
import { entities as InvoiceProductEntity, resolvers as InvoiceProductResolvers } from './invoice-product'
|
|
11
11
|
import { entities as JobSheetEntity, resolvers as JobSheetResolvers } from './job-sheet'
|
|
12
12
|
/* IMPORT ENTITIES AND RESOLVERS */
|
|
13
|
-
import { entities as DraftReleaseGoodEntities, resolvers as DraftReleaseGoodResolvers } from './draft-release-good'
|
|
14
13
|
import { entities as ManifestEntities, resolvers as ManifestResolvers } from './manifest'
|
|
15
14
|
import { entities as OrderInventoryEntity, resolvers as OrderInventoryResolvers } from './order-inventory'
|
|
16
15
|
import { entities as OrderProductEntity, resolvers as OrderProductResolvers } from './order-product'
|
|
@@ -18,7 +17,8 @@ import { entities as OrderVasEntity, resolvers as OrderVasResolvers } from './or
|
|
|
18
17
|
import { resolvers as OthersResolvers } from './others'
|
|
19
18
|
import { entities as PurchaseOrderEntity, resolvers as PurchaseOrderResolvers } from './purchase-order'
|
|
20
19
|
import {
|
|
21
|
-
entities as PurchaseOrderOtherChargeEntity,
|
|
20
|
+
entities as PurchaseOrderOtherChargeEntity,
|
|
21
|
+
resolvers as PurchaseOrderOtherChargeResolvers
|
|
22
22
|
} from './purchase-order-other-charge'
|
|
23
23
|
import { entities as ReleaseGoodEntity, resolvers as ReleaseGoodResolvers } from './release-good'
|
|
24
24
|
import {
|
|
@@ -38,26 +38,22 @@ import { entities as ShippingOrderEntity, resolvers as ShippingOrderResolvers }
|
|
|
38
38
|
import { entities as TransferOrderEntity, resolvers as TransferOrderResolvers } from './transfer-order'
|
|
39
39
|
import { entities as VasEntity, resolvers as VasResolvers } from './vas'
|
|
40
40
|
import { entities as VasOrderEntity, resolvers as VasOrderResolvers } from './vas-order'
|
|
41
|
-
import { entities as OrderToteEntity, resolvers as OrderToteResolvers } from './order-tote'
|
|
42
|
-
import { entities as OrderToteItemEntity, resolvers as OrderToteItemResolvers } from './order-tote-item'
|
|
43
|
-
import { entities as OrderToteSealEntity, resolvers as OrderToteSealResolvers } from './order-tote-seal'
|
|
44
|
-
import { OrderTote } from './order-tote/order-tote'
|
|
45
|
-
import { OrderToteSeal } from './order-tote-seal/order-tote-seal'
|
|
46
41
|
|
|
47
42
|
/* EXPORT ENTITY TYPES */
|
|
43
|
+
export * from './manifest/manifest'
|
|
44
|
+
export * from './reverse-kitting-order-inventory/reverse-kitting-order-inventory'
|
|
45
|
+
export * from './reverse-kitting-order/reverse-kitting-order'
|
|
48
46
|
export * from './arrival-notice/arrival-notice'
|
|
49
47
|
export * from './claim-detail/claim-detail'
|
|
50
48
|
export * from './claim-order/claim-order'
|
|
51
49
|
export * from './claim/claim'
|
|
52
50
|
export * from './collection-order/collection-order'
|
|
53
51
|
export * from './delivery-order/delivery-order'
|
|
54
|
-
export * from './draft-release-good/draft-release-good'
|
|
55
52
|
export * from './goods-receival-note/goods-receival-note'
|
|
56
53
|
export * from './inventory-check/inventory-check'
|
|
57
|
-
export * from './invoice-product/invoice-product'
|
|
58
54
|
export * from './invoice/invoice'
|
|
55
|
+
export * from './invoice-product/invoice-product'
|
|
59
56
|
export * from './job-sheet/job-sheet'
|
|
60
|
-
export * from './manifest/manifest'
|
|
61
57
|
export * from './order-inventory/order-inventory'
|
|
62
58
|
export * from './order-product/order-product'
|
|
63
59
|
export * from './order-vas/order-vas'
|
|
@@ -66,15 +62,10 @@ export * from './purchase-order/purchase-order'
|
|
|
66
62
|
export * from './release-good/release-good'
|
|
67
63
|
export * from './retail-replenishment-order/retail-replenishment-order'
|
|
68
64
|
export * from './return-order/return-order'
|
|
69
|
-
export * from './reverse-kitting-order-inventory/reverse-kitting-order-inventory'
|
|
70
|
-
export * from './reverse-kitting-order/reverse-kitting-order'
|
|
71
65
|
export * from './shipping-order/shipping-order'
|
|
72
66
|
export * from './transfer-order/transfer-order'
|
|
73
67
|
export * from './vas-order/vas-order'
|
|
74
68
|
export * from './vas/vas'
|
|
75
|
-
export * from './order-tote/order-tote'
|
|
76
|
-
export * from './order-tote-item/order-tote-item'
|
|
77
|
-
export * from './order-tote-seal/order-tote-seal'
|
|
78
69
|
|
|
79
70
|
/* EXPORT TYPES */
|
|
80
71
|
export * from './arrival-notice/arrival-notice-types'
|
|
@@ -83,11 +74,10 @@ export * from './claim-order/claim-order-types'
|
|
|
83
74
|
export * from './claim/claim-types'
|
|
84
75
|
export * from './collection-order/collection-order-types'
|
|
85
76
|
export * from './delivery-order/delivery-order-types'
|
|
86
|
-
export * from './draft-release-good/draft-release-good-type'
|
|
87
77
|
export * from './goods-receival-note/goods-receival-note-types'
|
|
88
78
|
export * from './inventory-check/inventory-check-types'
|
|
89
|
-
export * from './invoice-product/invoice-product-types'
|
|
90
79
|
export * from './invoice/invoice-types'
|
|
80
|
+
export * from './invoice-product/invoice-product-types'
|
|
91
81
|
export * from './job-sheet/job-sheet-types'
|
|
92
82
|
export * from './order-inventory/order-inventory-types'
|
|
93
83
|
export * from './order-product/order-product-types'
|
|
@@ -102,10 +92,6 @@ export * from './shipping-order/shipping-order-types'
|
|
|
102
92
|
export * from './transfer-order/transfer-order-types'
|
|
103
93
|
export * from './vas-order/vas-order-types'
|
|
104
94
|
export * from './vas/vas-types'
|
|
105
|
-
export * from './order-tote/order-tote-types'
|
|
106
|
-
export * from './order-tote-item/order-tote-item-types'
|
|
107
|
-
export * from './order-tote-seal/order-tote-seal-types'
|
|
108
|
-
|
|
109
95
|
|
|
110
96
|
/* EXPORT MUTATIONS */
|
|
111
97
|
export * from './arrival-notice/arrival-notice-mutation'
|
|
@@ -114,11 +100,10 @@ export * from './claim-order/claim-order-mutation'
|
|
|
114
100
|
export * from './claim/claim-mutation'
|
|
115
101
|
export * from './collection-order/collection-order-mutation'
|
|
116
102
|
export * from './delivery-order/delivery-order-mutation'
|
|
117
|
-
export * from './draft-release-good/draft-release-good-mutation'
|
|
118
103
|
export * from './goods-receival-note/goods-receival-note-mutation'
|
|
119
104
|
export * from './inventory-check/inventory-check-mutation'
|
|
120
|
-
export * from './invoice-product/invoice-product-mutation'
|
|
121
105
|
export * from './invoice/invoice-mutation'
|
|
106
|
+
export * from './invoice-product/invoice-product-mutation'
|
|
122
107
|
export * from './job-sheet/job-sheet-mutation'
|
|
123
108
|
export * from './order-inventory/order-inventory-mutation'
|
|
124
109
|
export * from './order-product/order-product-mutation'
|
|
@@ -132,9 +117,6 @@ export * from './shipping-order/shipping-order-mutation'
|
|
|
132
117
|
export * from './transfer-order/transfer-order-mutation'
|
|
133
118
|
export * from './vas-order/vas-order-mutation'
|
|
134
119
|
export * from './vas/vas-mutation'
|
|
135
|
-
export * from './order-tote/order-tote-mutation'
|
|
136
|
-
export * from './order-tote-item/order-tote-item-mutation'
|
|
137
|
-
export * from './order-tote-seal/order-tote-seal-mutation'
|
|
138
120
|
|
|
139
121
|
/* EXPORT QUERIES */
|
|
140
122
|
export * from './arrival-notice/arrival-notice-query'
|
|
@@ -143,11 +125,10 @@ export * from './claim-order/claim-order-query'
|
|
|
143
125
|
export * from './claim/claim-query'
|
|
144
126
|
export * from './collection-order/collection-order-query'
|
|
145
127
|
export * from './delivery-order/delivery-order-query'
|
|
146
|
-
export * from './draft-release-good/draft-release-good-query'
|
|
147
128
|
export * from './goods-receival-note/goods-receival-note-query'
|
|
148
129
|
export * from './inventory-check/inventory-check-query'
|
|
149
|
-
export * from './invoice-product/invoice-product-query'
|
|
150
130
|
export * from './invoice/invoice-query'
|
|
131
|
+
export * from './invoice-product/invoice-product-query'
|
|
151
132
|
export * from './job-sheet/job-sheet-query'
|
|
152
133
|
export * from './order-inventory/order-inventory-query'
|
|
153
134
|
export * from './order-product/order-product-query'
|
|
@@ -162,25 +143,23 @@ export * from './shipping-order/shipping-order-query'
|
|
|
162
143
|
export * from './transfer-order/transfer-order-query'
|
|
163
144
|
export * from './vas-order/vas-order-query'
|
|
164
145
|
export * from './vas/vas-query'
|
|
165
|
-
export * from './order-tote/order-tote-query'
|
|
166
|
-
export * from './order-tote-item/order-tote-item-query'
|
|
167
|
-
export * from './order-tote-seal/order-tote-seal-query'
|
|
168
146
|
|
|
169
147
|
export const entities = [
|
|
170
148
|
/* ENTITIES */
|
|
149
|
+
...ManifestEntities,
|
|
150
|
+
...ReverseKittingOrderInventoryEntities,
|
|
151
|
+
...ReverseKittingOrderEntities,
|
|
171
152
|
...ArrivalNoticeEntity,
|
|
172
|
-
...ClaimDetailEntity,
|
|
173
153
|
...ClaimEntity,
|
|
154
|
+
...ClaimDetailEntity,
|
|
174
155
|
...ClaimOrderEntity,
|
|
175
156
|
...CollectionOrderEntity,
|
|
176
157
|
...DeliveryOrderEntity,
|
|
177
|
-
...DraftReleaseGoodEntities,
|
|
178
158
|
...GoodsReceivalNoteEntity,
|
|
179
159
|
...InventoryCheckEntity,
|
|
180
160
|
...InvoiceEntity,
|
|
181
161
|
...InvoiceProductEntity,
|
|
182
162
|
...JobSheetEntity,
|
|
183
|
-
...ManifestEntities,
|
|
184
163
|
...OrderInventoryEntity,
|
|
185
164
|
...OrderProductEntity,
|
|
186
165
|
...OrderVasEntity,
|
|
@@ -189,50 +168,41 @@ export const entities = [
|
|
|
189
168
|
...ReleaseGoodEntity,
|
|
190
169
|
...RetailReplenishmentOrderEntity,
|
|
191
170
|
...ReturnOrderEntity,
|
|
192
|
-
...ReverseKittingOrderEntities,
|
|
193
|
-
...ReverseKittingOrderInventoryEntities,
|
|
194
171
|
...ShippingOrderEntity,
|
|
195
172
|
...TransferOrderEntity,
|
|
196
173
|
...VasEntity,
|
|
197
|
-
...VasOrderEntity
|
|
198
|
-
...OrderToteEntity,
|
|
199
|
-
...OrderToteItemEntity,
|
|
200
|
-
...OrderToteSealEntity
|
|
174
|
+
...VasOrderEntity
|
|
201
175
|
]
|
|
202
176
|
|
|
203
177
|
export const schema = {
|
|
204
178
|
resolverClasses: [
|
|
205
179
|
/* RESOLVER CLASSES */
|
|
180
|
+
...ManifestResolvers,
|
|
181
|
+
...ReverseKittingOrderInventoryResolvers,
|
|
182
|
+
...ReverseKittingOrderResolvers,
|
|
206
183
|
...ArrivalNoticeResolvers,
|
|
184
|
+
...ClaimResolvers,
|
|
207
185
|
...ClaimDetailResolvers,
|
|
208
186
|
...ClaimOrderResolvers,
|
|
209
|
-
...ClaimResolvers,
|
|
210
187
|
...CollectionOrderResolvers,
|
|
211
188
|
...DeliveryOrderResolvers,
|
|
212
|
-
...DraftReleaseGoodResolvers,
|
|
213
189
|
...GoodsReceivalNoteResolvers,
|
|
214
190
|
...InventoryCheckResolvers,
|
|
215
|
-
...InvoiceProductResolvers,
|
|
216
191
|
...InvoiceResolvers,
|
|
192
|
+
...InvoiceProductResolvers,
|
|
217
193
|
...JobSheetResolvers,
|
|
218
|
-
...ManifestResolvers,
|
|
219
194
|
...OrderInventoryResolvers,
|
|
220
195
|
...OrderProductResolvers,
|
|
221
196
|
...OrderVasResolvers,
|
|
222
197
|
...OthersResolvers,
|
|
223
|
-
...PurchaseOrderOtherChargeResolvers,
|
|
224
198
|
...PurchaseOrderResolvers,
|
|
199
|
+
...PurchaseOrderOtherChargeResolvers,
|
|
225
200
|
...ReleaseGoodResolvers,
|
|
226
201
|
...RetailReplenishmentOrderResolvers,
|
|
227
202
|
...ReturnOrderResolvers,
|
|
228
|
-
...ReverseKittingOrderInventoryResolvers,
|
|
229
|
-
...ReverseKittingOrderResolvers,
|
|
230
203
|
...ShippingOrderResolvers,
|
|
231
204
|
...TransferOrderResolvers,
|
|
232
205
|
...VasResolvers,
|
|
233
|
-
...VasOrderResolvers
|
|
234
|
-
...OrderToteResolvers,
|
|
235
|
-
...OrderToteItemResolvers,
|
|
236
|
-
...OrderToteSealResolvers
|
|
206
|
+
...VasOrderResolvers
|
|
237
207
|
]
|
|
238
208
|
}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
|
|
2
|
-
import { Brackets,
|
|
2
|
+
import { Brackets, getRepository, Like, SelectQueryBuilder, In, Not, IsNull } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
5
|
import { getPermittedBizplaceIds } from '@things-factory/biz-base'
|
|
6
6
|
import { Product } from '@things-factory/product-base'
|
|
7
7
|
import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
|
|
8
|
-
import { Inventory, InventoryPatch, Location } from '@things-factory/warehouse-base'
|
|
9
8
|
|
|
10
9
|
import { ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../constants'
|
|
11
10
|
import { ArrivalNotice } from '../arrival-notice/arrival-notice'
|
|
12
11
|
import { OrderInventoryList } from '../order-inventory/order-inventory-types'
|
|
13
12
|
import { ReleaseGood } from '../release-good/release-good'
|
|
14
13
|
import { OrderInventory } from './order-inventory'
|
|
14
|
+
import { Location } from '@things-factory/warehouse-base'
|
|
15
15
|
|
|
16
16
|
interface filterInterface {
|
|
17
17
|
name: string
|
|
@@ -172,44 +172,6 @@ export class OrderInventoryQuery {
|
|
|
172
172
|
})
|
|
173
173
|
}
|
|
174
174
|
|
|
175
|
-
@Query(returns => Boolean)
|
|
176
|
-
async validateOrderInventory(
|
|
177
|
-
@Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[],
|
|
178
|
-
@Ctx() context: any
|
|
179
|
-
) {
|
|
180
|
-
const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
|
|
181
|
-
|
|
182
|
-
let error = []
|
|
183
|
-
|
|
184
|
-
for (let i = 0; i < patches.length; i++) {
|
|
185
|
-
let foundExistingPallet: Inventory = await getRepository(Inventory).findOne({
|
|
186
|
-
where: { domain, palletId: patches[i]?.palletId }
|
|
187
|
-
})
|
|
188
|
-
|
|
189
|
-
if (!foundExistingPallet) {
|
|
190
|
-
foundExistingPallet = await getRepository(Inventory).findOne({
|
|
191
|
-
where: { id: patches[i]?.id }
|
|
192
|
-
})
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
if (patches[i]?.batchId != null) {
|
|
196
|
-
const worksheet: OrderInventory[] = await getRepository(OrderInventory).find({
|
|
197
|
-
where: { inventory: foundExistingPallet?.id, status: 'PICKING' }
|
|
198
|
-
})
|
|
199
|
-
|
|
200
|
-
if (worksheet.length > 0) {
|
|
201
|
-
error = [...worksheet]
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
if (error.length == 0) {
|
|
207
|
-
return true
|
|
208
|
-
} else {
|
|
209
|
-
return false
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
|
|
213
175
|
@Query(returns => OrderInventoryList)
|
|
214
176
|
async inventoriesByOrder(@Ctx() context: any, @Args() params: ListParam): Promise<OrderInventoryList> {
|
|
215
177
|
const { domain, user }: { domain: Domain; user: User } = context.state
|
|
@@ -158,9 +158,6 @@ export class OrderInventoryPatch {
|
|
|
158
158
|
@Field(type => ObjectRef, { nullable: true })
|
|
159
159
|
product: ObjectRef
|
|
160
160
|
|
|
161
|
-
@Field(type => ObjectRef, { nullable: true })
|
|
162
|
-
orderProduct: ObjectRef
|
|
163
|
-
|
|
164
161
|
@Field({ nullable: true })
|
|
165
162
|
batchId: string
|
|
166
163
|
|
|
@@ -200,9 +197,6 @@ export class OrderInventoryPatch {
|
|
|
200
197
|
@Field({ nullable: true })
|
|
201
198
|
productId: string
|
|
202
199
|
|
|
203
|
-
@Field({ nullable: true })
|
|
204
|
-
orderProductId: string
|
|
205
|
-
|
|
206
200
|
@Field({ nullable: true })
|
|
207
201
|
uom: string
|
|
208
202
|
|
|
@@ -37,11 +37,11 @@ import { TransferOrder } from '../transfer-order/transfer-order'
|
|
|
37
37
|
],
|
|
38
38
|
{ unique: true }
|
|
39
39
|
)
|
|
40
|
-
@Index(
|
|
41
|
-
|
|
42
|
-
orderInventory.deliveryOrder,
|
|
43
|
-
|
|
44
|
-
|
|
40
|
+
@Index(
|
|
41
|
+
'ix_order-inventory_2',
|
|
42
|
+
(orderInventory: OrderInventory) => [orderInventory.bizplace, orderInventory.deliveryOrder, orderInventory.inventory],
|
|
43
|
+
{ unique: true }
|
|
44
|
+
)
|
|
45
45
|
@Index(
|
|
46
46
|
'ix_order-inventory_3',
|
|
47
47
|
(orderInventory: OrderInventory) => [
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
|
|
2
|
-
|
|
3
1
|
import { ObjectRef, ScalarDate } from '@things-factory/shell'
|
|
4
|
-
|
|
2
|
+
import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
|
|
5
3
|
import { OrderProduct } from './order-product'
|
|
6
4
|
|
|
7
5
|
@ObjectType()
|
|
@@ -84,8 +82,8 @@ export class OrderProductPatch {
|
|
|
84
82
|
@Field(type => ObjectRef, { nullable: true })
|
|
85
83
|
toInventory: ObjectRef
|
|
86
84
|
|
|
87
|
-
@Field(type =>
|
|
88
|
-
product:
|
|
85
|
+
@Field(type => ObjectRef, { nullable: true })
|
|
86
|
+
product: ObjectRef
|
|
89
87
|
|
|
90
88
|
@Field({ nullable: true })
|
|
91
89
|
batchId: string
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Field, ID, ObjectType
|
|
1
|
+
import { Field, ID, ObjectType } from 'type-graphql'
|
|
2
2
|
import {
|
|
3
3
|
Column,
|
|
4
4
|
CreateDateColumn,
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
|
|
13
13
|
import { User } from '@things-factory/auth-base'
|
|
14
14
|
import { Bizplace } from '@things-factory/biz-base'
|
|
15
|
-
import { Product
|
|
15
|
+
import { Product } from '@things-factory/product-base'
|
|
16
16
|
import { Domain, ScalarDate } from '@things-factory/shell'
|
|
17
17
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
18
18
|
|
|
@@ -21,7 +21,6 @@ import { CollectionOrder } from '../collection-order/collection-order'
|
|
|
21
21
|
import { DeliveryOrder } from '../delivery-order/delivery-order'
|
|
22
22
|
import { PurchaseOrder } from '../purchase-order/purchase-order'
|
|
23
23
|
import { ReleaseGood } from '../release-good/release-good'
|
|
24
|
-
import { DraftReleaseGood } from '../draft-release-good/draft-release-good'
|
|
25
24
|
import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
|
|
26
25
|
|
|
27
26
|
@Entity()
|
|
@@ -103,13 +102,6 @@ export class OrderProduct {
|
|
|
103
102
|
@RelationId((orderProduct: OrderProduct) => orderProduct.releaseGood)
|
|
104
103
|
releaseGoodId: string
|
|
105
104
|
|
|
106
|
-
@ManyToOne(type => DraftReleaseGood)
|
|
107
|
-
@Field(type => DraftReleaseGood, { nullable: true })
|
|
108
|
-
draftReleaseGood: DraftReleaseGood
|
|
109
|
-
|
|
110
|
-
@RelationId((orderProduct: OrderProduct) => orderProduct.draftReleaseGood)
|
|
111
|
-
draftReleaseGoodId: string
|
|
112
|
-
|
|
113
105
|
@ManyToOne(type => CollectionOrder)
|
|
114
106
|
@Field(type => CollectionOrder, { nullable: true })
|
|
115
107
|
collectionOrder: CollectionOrder
|
|
@@ -159,20 +151,13 @@ export class OrderProduct {
|
|
|
159
151
|
@RelationId((orderProduct: OrderProduct) => orderProduct.toInventory)
|
|
160
152
|
toInventoryId: string
|
|
161
153
|
|
|
162
|
-
@ManyToOne(type => Product, { nullable:
|
|
154
|
+
@ManyToOne(type => Product, { nullable: false })
|
|
163
155
|
@Field(type => Product)
|
|
164
156
|
product: Product
|
|
165
157
|
|
|
166
158
|
@RelationId((orderProduct: OrderProduct) => orderProduct.product)
|
|
167
159
|
productId: string
|
|
168
160
|
|
|
169
|
-
@ManyToOne(type => ProductBundle, { nullable: true })
|
|
170
|
-
@Field(type => ProductBundle)
|
|
171
|
-
productBundle: ProductBundle
|
|
172
|
-
|
|
173
|
-
@RelationId((orderProduct: OrderProduct) => orderProduct.productBundle)
|
|
174
|
-
productBundleId: string
|
|
175
|
-
|
|
176
161
|
@Column()
|
|
177
162
|
@Field()
|
|
178
163
|
batchId: string
|
|
@@ -326,16 +311,4 @@ export class OrderProduct {
|
|
|
326
311
|
|
|
327
312
|
@RelationId((orderProduct: OrderProduct) => orderProduct.updater)
|
|
328
313
|
updaterId: string
|
|
329
|
-
|
|
330
|
-
@Field(type => Float, { nullable: true })
|
|
331
|
-
remainQty: number
|
|
332
|
-
|
|
333
|
-
@Field(type => Float, { nullable: true })
|
|
334
|
-
remainUomValue: number
|
|
335
|
-
|
|
336
|
-
@Field({ nullable: true })
|
|
337
|
-
remainUomValueWithUom: string
|
|
338
|
-
|
|
339
|
-
@Field({ nullable: true })
|
|
340
|
-
groupType: string
|
|
341
314
|
}
|
|
@@ -20,41 +20,6 @@ import { InventoryUtil } from '../../utils'
|
|
|
20
20
|
|
|
21
21
|
@Resolver()
|
|
22
22
|
export class OtherQuery {
|
|
23
|
-
@Directive('@privilege(category: "inventory", privilege: "query")')
|
|
24
|
-
@Directive('@transaction')
|
|
25
|
-
@Query(returns => InventoryProductGroupList)
|
|
26
|
-
async allBizplaceProductInventory(@Ctx() context: any, @Args() params: ListParam): Promise<InventoryProductGroupList> {
|
|
27
|
-
const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
|
|
28
|
-
context.state
|
|
29
|
-
|
|
30
|
-
let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
|
|
31
|
-
|
|
32
|
-
let bizplaceId: any = params.filters.find(filter => filter.name === 'bizplace_id').value
|
|
33
|
-
let foundPermittedBizplace: Bizplace
|
|
34
|
-
let companyBizplace: Bizplace
|
|
35
|
-
|
|
36
|
-
if (bizplaceId) {
|
|
37
|
-
foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == bizplaceId)
|
|
38
|
-
|
|
39
|
-
if (foundPermittedBizplace) {
|
|
40
|
-
if (!foundPermittedBizplace.company?.id) {
|
|
41
|
-
foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
|
|
42
|
-
relations: ['company', 'company.domain']
|
|
43
|
-
})
|
|
44
|
-
}
|
|
45
|
-
const companyDomain: Domain = foundPermittedBizplace.company.domain
|
|
46
|
-
companyBizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: companyDomain } })
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
|
|
51
|
-
if (bizplace) bizplaces.push(bizplace)
|
|
52
|
-
|
|
53
|
-
const { items, total } = await InventoryUtil.bizplaceProductInventory(bizplaces, params, context, tx)
|
|
54
|
-
|
|
55
|
-
return { items, total }
|
|
56
|
-
}
|
|
57
|
-
|
|
58
23
|
@Directive('@privilege(category: "inventory", privilege: "query")')
|
|
59
24
|
@Directive('@transaction')
|
|
60
25
|
@Query(returns => InventoryProductGroupList)
|
|
@@ -200,11 +165,11 @@ export class OtherQuery {
|
|
|
200
165
|
inventory:
|
|
201
166
|
total > 0
|
|
202
167
|
? {
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
168
|
+
...items[0],
|
|
169
|
+
remainQty: total > 0 ? items[0].remainQty : null,
|
|
170
|
+
remainUomValue: total > 0 ? items[0].remainUomValue : null,
|
|
171
|
+
remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
|
|
172
|
+
}
|
|
208
173
|
: null,
|
|
209
174
|
productId: total > 0 ? items[0].productId : null,
|
|
210
175
|
productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
|
|
@@ -339,7 +304,7 @@ export class OtherQuery {
|
|
|
339
304
|
let productDetail: ProductDetail
|
|
340
305
|
const hasConditions: boolean = Boolean(
|
|
341
306
|
(orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
|
|
342
|
-
|
|
307
|
+
(orderProduct?.uom && orderProduct?.uom.trim() != '')
|
|
343
308
|
)
|
|
344
309
|
let productDetailCondition: any = { product: foundProduct }
|
|
345
310
|
|
|
@@ -362,8 +327,8 @@ export class OtherQuery {
|
|
|
362
327
|
? productDetail.uomValue
|
|
363
328
|
: null
|
|
364
329
|
: orderProduct?.uomValue
|
|
365
|
-
|
|
366
|
-
|
|
330
|
+
? orderProduct.uomValue
|
|
331
|
+
: productDetail.uomValue
|
|
367
332
|
|
|
368
333
|
newOrderProduct = {
|
|
369
334
|
...orderProduct,
|
|
@@ -134,7 +134,7 @@ export class ReleaseGoodMutation {
|
|
|
134
134
|
context,
|
|
135
135
|
tx
|
|
136
136
|
)
|
|
137
|
-
} catch (error) {
|
|
137
|
+
} catch (error) {}
|
|
138
138
|
|
|
139
139
|
if (errorsCaught.length)
|
|
140
140
|
throw new ValidationError({
|
|
@@ -226,8 +226,7 @@ export class ReleaseGoodMutation {
|
|
|
226
226
|
|
|
227
227
|
foundReleaseGood = await tx.getRepository(ReleaseGood).save({
|
|
228
228
|
...foundReleaseGood,
|
|
229
|
-
...releaseGood
|
|
230
|
-
remark: releaseGood?.remark ? releaseGood.remark : null
|
|
229
|
+
...releaseGood
|
|
231
230
|
})
|
|
232
231
|
|
|
233
232
|
return foundReleaseGood
|
|
@@ -301,27 +300,6 @@ export class ReleaseGoodMutation {
|
|
|
301
300
|
|
|
302
301
|
return receivedRO
|
|
303
302
|
}
|
|
304
|
-
|
|
305
|
-
@Directive('@privilege(category: "order_customer", privilege: "mutation")')
|
|
306
|
-
@Directive('@transaction')
|
|
307
|
-
@Mutation(returns => Boolean)
|
|
308
|
-
async executeOrderRemark(@Arg('releaseGoodNo') releaseGoodNo: string, @Ctx() context: any): Promise<boolean> {
|
|
309
|
-
const { domain, tx, user } = context.state
|
|
310
|
-
|
|
311
|
-
await tx.getRepository(ReleaseGood).update(
|
|
312
|
-
{
|
|
313
|
-
domain,
|
|
314
|
-
name: releaseGoodNo
|
|
315
|
-
},
|
|
316
|
-
{
|
|
317
|
-
checkedRemarkAt: new Date(),
|
|
318
|
-
checkedRemarkUser: user,
|
|
319
|
-
checkedRemarkBy: user.name
|
|
320
|
-
}
|
|
321
|
-
)
|
|
322
|
-
|
|
323
|
-
return true
|
|
324
|
-
}
|
|
325
303
|
}
|
|
326
304
|
|
|
327
305
|
export async function deleteReleaseGood(tx: EntityManager, name: string, user: User, domain: Domain): Promise<boolean> {
|