@things-factory/sales-base 6.2.139 → 6.2.142
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/service/claim-detail/claim-detail.js +1 -1
- package/dist-server/service/claim-detail/claim-detail.js.map +1 -1
- package/dist-server/service/collection-order/collection-order.js +1 -1
- package/dist-server/service/collection-order/collection-order.js.map +1 -1
- package/dist-server/service/delivery-order/delivery-order.js +1 -1
- package/dist-server/service/delivery-order/delivery-order.js.map +1 -1
- package/dist-server/service/invoice-product/invoice-product.js +5 -5
- package/dist-server/service/invoice-product/invoice-product.js.map +1 -1
- package/dist-server/service/order-inventory/order-inventory.js +17 -30
- package/dist-server/service/order-inventory/order-inventory.js.map +1 -1
- package/dist-server/service/order-product/order-product-types.js +8 -0
- package/dist-server/service/order-product/order-product-types.js.map +1 -1
- package/dist-server/service/order-product/order-product.js +30 -35
- package/dist-server/service/order-product/order-product.js.map +1 -1
- package/dist-server/service/order-vas/order-vas.js +2 -2
- package/dist-server/service/order-vas/order-vas.js.map +1 -1
- package/dist-server/service/purchase-order-other-charge/purchase-order-other-charge.js +4 -5
- package/dist-server/service/purchase-order-other-charge/purchase-order-other-charge.js.map +1 -1
- package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.js +2 -5
- package/dist-server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.js.map +1 -1
- package/dist-server/service/vas/vas.js +1 -1
- package/dist-server/service/vas/vas.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/server/service/claim-detail/claim-detail.ts +3 -12
- package/server/service/collection-order/collection-order.ts +3 -14
- package/server/service/delivery-order/delivery-order.ts +3 -13
- package/server/service/invoice-product/invoice-product.ts +7 -16
- package/server/service/order-inventory/order-inventory.ts +18 -35
- package/server/service/order-product/order-product-types.ts +6 -0
- package/server/service/order-product/order-product.ts +29 -40
- package/server/service/order-vas/order-vas.ts +4 -13
- package/server/service/purchase-order-other-charge/purchase-order-other-charge.ts +6 -20
- package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.ts +5 -19
- package/server/service/vas/vas.ts +3 -12
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.142",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,13 +28,13 @@
|
|
|
28
28
|
"@things-factory/auth-base": "^6.2.139",
|
|
29
29
|
"@things-factory/biz-base": "^6.2.139",
|
|
30
30
|
"@things-factory/code-base": "^6.2.139",
|
|
31
|
-
"@things-factory/integration-sftp": "^6.2.
|
|
31
|
+
"@things-factory/integration-sftp": "^6.2.140",
|
|
32
32
|
"@things-factory/notification": "^6.2.139",
|
|
33
|
-
"@things-factory/product-base": "^6.2.
|
|
33
|
+
"@things-factory/product-base": "^6.2.142",
|
|
34
34
|
"@things-factory/setting-base": "^6.2.139",
|
|
35
35
|
"@things-factory/shell": "^6.2.139",
|
|
36
36
|
"@things-factory/transport-base": "^6.2.139",
|
|
37
|
-
"@things-factory/warehouse-base": "^6.2.
|
|
37
|
+
"@things-factory/warehouse-base": "^6.2.142"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "78bb2ad1a9d851be0c6ea0e176ccbab61c3b6cc8"
|
|
40
40
|
}
|
|
@@ -1,16 +1,7 @@
|
|
|
1
1
|
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
2
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
3
3
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
4
|
-
import {
|
|
5
|
-
Column,
|
|
6
|
-
CreateDateColumn,
|
|
7
|
-
Entity,
|
|
8
|
-
Index,
|
|
9
|
-
ManyToOne,
|
|
10
|
-
PrimaryGeneratedColumn,
|
|
11
|
-
RelationId,
|
|
12
|
-
UpdateDateColumn
|
|
13
|
-
} from 'typeorm'
|
|
4
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
14
5
|
import { Claim } from '../'
|
|
15
6
|
|
|
16
7
|
@Entity()
|
|
@@ -40,7 +31,7 @@ export class ClaimDetail {
|
|
|
40
31
|
@Field({ nullable: true })
|
|
41
32
|
refNo: String
|
|
42
33
|
|
|
43
|
-
@Column('float')
|
|
34
|
+
@Column('float', { transformer: roundTransformer })
|
|
44
35
|
@Field()
|
|
45
36
|
amount: number
|
|
46
37
|
|
|
@@ -1,21 +1,10 @@
|
|
|
1
1
|
import { Attachment } from '@things-factory/attachment-base'
|
|
2
2
|
import { User } from '@things-factory/auth-base'
|
|
3
3
|
import { Bizplace } from '@things-factory/biz-base'
|
|
4
|
-
import { Domain } from '@things-factory/shell'
|
|
4
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
5
5
|
import { TransportDriver, TransportVehicle } from '@things-factory/transport-base'
|
|
6
6
|
import { Field, ObjectType } from 'type-graphql'
|
|
7
|
-
import {
|
|
8
|
-
Column,
|
|
9
|
-
CreateDateColumn,
|
|
10
|
-
Entity,
|
|
11
|
-
Index,
|
|
12
|
-
JoinColumn,
|
|
13
|
-
ManyToOne,
|
|
14
|
-
OneToOne,
|
|
15
|
-
PrimaryGeneratedColumn,
|
|
16
|
-
RelationId,
|
|
17
|
-
UpdateDateColumn
|
|
18
|
-
} from 'typeorm'
|
|
7
|
+
import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
19
8
|
import { ArrivalNotice } from '../'
|
|
20
9
|
|
|
21
10
|
@Entity()
|
|
@@ -62,7 +51,7 @@ export class CollectionOrder {
|
|
|
62
51
|
@Field({ nullable: true })
|
|
63
52
|
collectionDate: string
|
|
64
53
|
|
|
65
|
-
@Column('float', { nullable: true })
|
|
54
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
66
55
|
@Field({ nullable: true })
|
|
67
56
|
loadWeight: Number
|
|
68
57
|
|
|
@@ -1,20 +1,10 @@
|
|
|
1
1
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
2
|
-
import {
|
|
3
|
-
Column,
|
|
4
|
-
CreateDateColumn,
|
|
5
|
-
Entity,
|
|
6
|
-
Index,
|
|
7
|
-
ManyToOne,
|
|
8
|
-
OneToMany,
|
|
9
|
-
PrimaryGeneratedColumn,
|
|
10
|
-
RelationId,
|
|
11
|
-
UpdateDateColumn
|
|
12
|
-
} from 'typeorm'
|
|
2
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
13
3
|
|
|
14
4
|
import { Attachment } from '@things-factory/attachment-base'
|
|
15
5
|
import { User } from '@things-factory/auth-base'
|
|
16
6
|
import { Bizplace } from '@things-factory/biz-base'
|
|
17
|
-
import { Domain } from '@things-factory/shell'
|
|
7
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
18
8
|
import { TransportDriver, TransportVehicle } from '@things-factory/transport-base'
|
|
19
9
|
|
|
20
10
|
import { OrderInventory } from '../order-inventory/order-inventory'
|
|
@@ -115,7 +105,7 @@ export class DeliveryOrder {
|
|
|
115
105
|
@Field({ nullable: true })
|
|
116
106
|
deliveryDateTime: Date
|
|
117
107
|
|
|
118
|
-
@Column('float', { nullable: true })
|
|
108
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
119
109
|
@Field({ nullable: true })
|
|
120
110
|
loadWeight: Number
|
|
121
111
|
|
|
@@ -1,18 +1,9 @@
|
|
|
1
1
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
2
|
-
import {
|
|
3
|
-
Column,
|
|
4
|
-
CreateDateColumn,
|
|
5
|
-
Entity,
|
|
6
|
-
Index,
|
|
7
|
-
ManyToOne,
|
|
8
|
-
PrimaryGeneratedColumn,
|
|
9
|
-
RelationId,
|
|
10
|
-
UpdateDateColumn
|
|
11
|
-
} from 'typeorm'
|
|
2
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
12
3
|
|
|
13
4
|
import { User } from '@things-factory/auth-base'
|
|
14
5
|
import { Product } from '@things-factory/product-base'
|
|
15
|
-
import { Domain } from '@things-factory/shell'
|
|
6
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
16
7
|
|
|
17
8
|
import { Invoice } from '../invoice/invoice'
|
|
18
9
|
|
|
@@ -57,23 +48,23 @@ export class InvoiceProduct {
|
|
|
57
48
|
@Field()
|
|
58
49
|
qty: number
|
|
59
50
|
|
|
60
|
-
@Column('float', { default: 0 })
|
|
51
|
+
@Column('float', { default: 0, transformer: roundTransformer })
|
|
61
52
|
@Field({ nullable: true })
|
|
62
53
|
otherCharges: number
|
|
63
54
|
|
|
64
|
-
@Column('float', { default: 0 })
|
|
55
|
+
@Column('float', { default: 0, transformer: roundTransformer })
|
|
65
56
|
@Field()
|
|
66
57
|
unitPrice: number
|
|
67
58
|
|
|
68
|
-
@Column('float', { default: 0 })
|
|
59
|
+
@Column('float', { default: 0, transformer: roundTransformer })
|
|
69
60
|
@Field()
|
|
70
61
|
paidPrice: number
|
|
71
62
|
|
|
72
|
-
@Column('float', { default: 0 })
|
|
63
|
+
@Column('float', { default: 0, transformer: roundTransformer })
|
|
73
64
|
@Field({ nullable: true })
|
|
74
65
|
discount: number
|
|
75
66
|
|
|
76
|
-
@Column('float', { default: 0 })
|
|
67
|
+
@Column('float', { default: 0, transformer: roundTransformer })
|
|
77
68
|
@Field({ nullable: true })
|
|
78
69
|
shippingFeePaidByCustomer: number
|
|
79
70
|
|
|
@@ -4,7 +4,7 @@ import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryG
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
5
|
import { Bizplace } from '@things-factory/biz-base'
|
|
6
6
|
import { Product } from '@things-factory/product-base'
|
|
7
|
-
import { Domain } from '@things-factory/shell'
|
|
7
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
8
8
|
import { Inventory, Location } from '@things-factory/warehouse-base'
|
|
9
9
|
|
|
10
10
|
import { ArrivalNotice } from '../arrival-notice/arrival-notice'
|
|
@@ -20,28 +20,11 @@ import { TransferOrder } from '../transfer-order/transfer-order'
|
|
|
20
20
|
@Index('ix_order-inventory_0', (orderInventory: OrderInventory) => [orderInventory.domain, orderInventory.name], {
|
|
21
21
|
unique: true
|
|
22
22
|
})
|
|
23
|
-
@Index(
|
|
24
|
-
|
|
25
|
-
(orderInventory: OrderInventory) => [
|
|
26
|
-
orderInventory.bizplace,
|
|
27
|
-
orderInventory.inventoryCheck,
|
|
28
|
-
orderInventory.inventory
|
|
29
|
-
],
|
|
30
|
-
{ unique: true }
|
|
31
|
-
)
|
|
32
|
-
@Index('ix_order-inventory_2', (orderInventory: OrderInventory) => [
|
|
33
|
-
orderInventory.bizplace,
|
|
34
|
-
orderInventory.deliveryOrder,
|
|
35
|
-
orderInventory.inventory
|
|
36
|
-
])
|
|
23
|
+
@Index('ix_order-inventory_1', (orderInventory: OrderInventory) => [orderInventory.bizplace, orderInventory.inventoryCheck, orderInventory.inventory], { unique: true })
|
|
24
|
+
@Index('ix_order-inventory_2', (orderInventory: OrderInventory) => [orderInventory.bizplace, orderInventory.deliveryOrder, orderInventory.inventory])
|
|
37
25
|
@Index(
|
|
38
26
|
'ix_order-inventory_3',
|
|
39
|
-
(orderInventory: OrderInventory) => [
|
|
40
|
-
orderInventory.bizplace,
|
|
41
|
-
orderInventory.transferOrder,
|
|
42
|
-
orderInventory.deliveryOrder,
|
|
43
|
-
orderInventory.inventory
|
|
44
|
-
],
|
|
27
|
+
(orderInventory: OrderInventory) => [orderInventory.bizplace, orderInventory.transferOrder, orderInventory.deliveryOrder, orderInventory.inventory],
|
|
45
28
|
{ unique: true }
|
|
46
29
|
)
|
|
47
30
|
@Index('ix_order-inventory_4', (orderInventory: OrderInventory) => [
|
|
@@ -122,7 +105,7 @@ export class OrderInventory {
|
|
|
122
105
|
@Field({ nullable: true })
|
|
123
106
|
packingType: string
|
|
124
107
|
|
|
125
|
-
@Column('float', { default: 1 })
|
|
108
|
+
@Column('float', { default: 1, transformer: roundTransformer })
|
|
126
109
|
@Field({ nullable: true })
|
|
127
110
|
packingSize?: number
|
|
128
111
|
|
|
@@ -191,11 +174,11 @@ export class OrderInventory {
|
|
|
191
174
|
@Field({ nullable: true })
|
|
192
175
|
inspectedQty: number
|
|
193
176
|
|
|
194
|
-
@Column({ nullable: true, type: 'float' })
|
|
177
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
195
178
|
@Field({ nullable: true })
|
|
196
179
|
originUomValue: number
|
|
197
180
|
|
|
198
|
-
@Column({ nullable: true, type: 'float' })
|
|
181
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
199
182
|
@Field({ nullable: true })
|
|
200
183
|
inspectedUomValue: number
|
|
201
184
|
|
|
@@ -228,23 +211,23 @@ export class OrderInventory {
|
|
|
228
211
|
@RelationId((orderInventory: OrderInventory) => orderInventory.binLocation)
|
|
229
212
|
binLocationId: string
|
|
230
213
|
|
|
231
|
-
@Column({ nullable: true, type: 'float' })
|
|
214
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
232
215
|
@Field({ nullable: true })
|
|
233
216
|
releaseQty: number
|
|
234
217
|
|
|
235
|
-
@Column({ nullable: true, type: 'float', default: 0 })
|
|
218
|
+
@Column({ nullable: true, type: 'float', default: 0, transformer: roundTransformer })
|
|
236
219
|
@Field({ nullable: true })
|
|
237
220
|
pickedQty: number
|
|
238
221
|
|
|
239
|
-
@Column({ nullable: true, type: 'float', default: 0 })
|
|
222
|
+
@Column({ nullable: true, type: 'float', default: 0, transformer: roundTransformer })
|
|
240
223
|
@Field({ nullable: true })
|
|
241
224
|
packedQty: number
|
|
242
225
|
|
|
243
|
-
@Column({ nullable: true, type: 'float', default: 0 })
|
|
226
|
+
@Column({ nullable: true, type: 'float', default: 0, transformer: roundTransformer })
|
|
244
227
|
@Field({ nullable: true })
|
|
245
228
|
sortedQty: number
|
|
246
229
|
|
|
247
|
-
@Column({ nullable: true, type: 'float' })
|
|
230
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
248
231
|
@Field({ nullable: true })
|
|
249
232
|
releaseUomValue: number
|
|
250
233
|
|
|
@@ -252,27 +235,27 @@ export class OrderInventory {
|
|
|
252
235
|
@Field({ nullable: true })
|
|
253
236
|
uom: string
|
|
254
237
|
|
|
255
|
-
@Column({ nullable: true, type: 'float' })
|
|
238
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
256
239
|
@Field({ nullable: true })
|
|
257
240
|
returnQty: number
|
|
258
241
|
|
|
259
|
-
@Column({ nullable: true, type: 'float' })
|
|
242
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
260
243
|
@Field({ nullable: true })
|
|
261
244
|
returnUomValue: number
|
|
262
245
|
|
|
263
|
-
@Column({ nullable: true, type: 'float' })
|
|
246
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
264
247
|
@Field({ nullable: true })
|
|
265
248
|
returnToLocationQty: number
|
|
266
249
|
|
|
267
|
-
@Column({ nullable: true, type: 'float' })
|
|
250
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
268
251
|
@Field({ nullable: true })
|
|
269
252
|
returnToLocationUomValue: number
|
|
270
253
|
|
|
271
|
-
@Column({ nullable: true, type: 'float' })
|
|
254
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
272
255
|
@Field({ nullable: true })
|
|
273
256
|
actualPackQty: number
|
|
274
257
|
|
|
275
|
-
@Column('float', { nullable: true })
|
|
258
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
276
259
|
@Field({ nullable: true })
|
|
277
260
|
palletQty: number
|
|
278
261
|
|
|
@@ -87,6 +87,9 @@ export class OrderProductPatch {
|
|
|
87
87
|
@Field(type => InboundProduct, { nullable: true })
|
|
88
88
|
product: InboundProduct
|
|
89
89
|
|
|
90
|
+
@Field(type => ObjectRef, { nullable: true })
|
|
91
|
+
contactPoint?: ObjectRef
|
|
92
|
+
|
|
90
93
|
@Field({ nullable: true })
|
|
91
94
|
batchId: string
|
|
92
95
|
|
|
@@ -228,6 +231,9 @@ export class NewOrderProduct {
|
|
|
228
231
|
@Field(type => InboundProduct, { nullable: true })
|
|
229
232
|
product: InboundProduct
|
|
230
233
|
|
|
234
|
+
@Field(type => ObjectRef, { nullable: true })
|
|
235
|
+
contactPoint?: ObjectRef
|
|
236
|
+
|
|
231
237
|
@Field({ nullable: true })
|
|
232
238
|
productSKU: string
|
|
233
239
|
|
|
@@ -2,9 +2,9 @@ import { Field, Float, ID, ObjectType } from 'type-graphql'
|
|
|
2
2
|
import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import { Bizplace } from '@things-factory/biz-base'
|
|
5
|
+
import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
6
6
|
import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
|
|
7
|
-
import { Domain, ScalarDate } from '@things-factory/shell'
|
|
7
|
+
import { Domain, ScalarDate, roundTransformer } from '@things-factory/shell'
|
|
8
8
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
9
9
|
|
|
10
10
|
import { ArrivalNotice } from '../arrival-notice/arrival-notice'
|
|
@@ -29,33 +29,15 @@ import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-r
|
|
|
29
29
|
])
|
|
30
30
|
@Index(
|
|
31
31
|
'ix_order-product_2',
|
|
32
|
-
(orderProduct: OrderProduct) => [
|
|
33
|
-
orderProduct.bizplace,
|
|
34
|
-
orderProduct.retailReplenishmentOrder,
|
|
35
|
-
orderProduct.product,
|
|
36
|
-
orderProduct.batchId,
|
|
37
|
-
orderProduct.packingType
|
|
38
|
-
],
|
|
32
|
+
(orderProduct: OrderProduct) => [orderProduct.bizplace, orderProduct.retailReplenishmentOrder, orderProduct.product, orderProduct.batchId, orderProduct.packingType],
|
|
39
33
|
{ unique: true }
|
|
40
34
|
)
|
|
41
35
|
@Index(
|
|
42
36
|
'ix_order-product_3',
|
|
43
|
-
(orderProduct: OrderProduct) => [
|
|
44
|
-
orderProduct.bizplace,
|
|
45
|
-
orderProduct.purchaseOrder,
|
|
46
|
-
orderProduct.product,
|
|
47
|
-
orderProduct.batchId,
|
|
48
|
-
orderProduct.uom
|
|
49
|
-
],
|
|
37
|
+
(orderProduct: OrderProduct) => [orderProduct.bizplace, orderProduct.purchaseOrder, orderProduct.product, orderProduct.batchId, orderProduct.uom],
|
|
50
38
|
{ unique: true }
|
|
51
39
|
)
|
|
52
|
-
@Index(
|
|
53
|
-
'ix_order-product_4',
|
|
54
|
-
(orderProduct: OrderProduct) => [
|
|
55
|
-
orderProduct.draftReleaseGood
|
|
56
|
-
],
|
|
57
|
-
{ unique: false }
|
|
58
|
-
)
|
|
40
|
+
@Index('ix_order-product_4', (orderProduct: OrderProduct) => [orderProduct.draftReleaseGood], { unique: false })
|
|
59
41
|
@ObjectType()
|
|
60
42
|
export class OrderProduct {
|
|
61
43
|
@PrimaryGeneratedColumn('uuid')
|
|
@@ -183,6 +165,13 @@ export class OrderProduct {
|
|
|
183
165
|
@RelationId((orderProduct: OrderProduct) => orderProduct.productBundle)
|
|
184
166
|
productBundleId: string
|
|
185
167
|
|
|
168
|
+
@ManyToOne(type => ContactPoint)
|
|
169
|
+
@Field(type => ContactPoint, { nullable: true })
|
|
170
|
+
contactPoint?: ContactPoint
|
|
171
|
+
|
|
172
|
+
@RelationId((orderProduct: OrderProduct) => orderProduct.contactPoint)
|
|
173
|
+
contactPointId?: string
|
|
174
|
+
|
|
186
175
|
@Column()
|
|
187
176
|
@Field()
|
|
188
177
|
batchId: string
|
|
@@ -207,7 +196,7 @@ export class OrderProduct {
|
|
|
207
196
|
@Field({ nullable: true })
|
|
208
197
|
adjustedPackingType: string
|
|
209
198
|
|
|
210
|
-
@Column('float', { nullable: true, default: 1 })
|
|
199
|
+
@Column('float', { nullable: true, default: 1, transformer: roundTransformer })
|
|
211
200
|
@Field({ nullable: true })
|
|
212
201
|
packingSize: number
|
|
213
202
|
|
|
@@ -227,19 +216,19 @@ export class OrderProduct {
|
|
|
227
216
|
@Field({ nullable: true })
|
|
228
217
|
adjustedUom: string
|
|
229
218
|
|
|
230
|
-
@Column('float', { nullable: true })
|
|
219
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
231
220
|
@Field({ nullable: true })
|
|
232
221
|
uomValue: number
|
|
233
222
|
|
|
234
|
-
@Column('float', { nullable: true })
|
|
223
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
235
224
|
@Field({ nullable: true })
|
|
236
225
|
adjustedUomValue: number
|
|
237
226
|
|
|
238
|
-
@Column('float', { nullable: true })
|
|
227
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
239
228
|
@Field({ nullable: true })
|
|
240
229
|
unpackUomValue: number
|
|
241
230
|
|
|
242
|
-
@Column('float')
|
|
231
|
+
@Column('float', { transformer: roundTransformer })
|
|
243
232
|
@Field()
|
|
244
233
|
packQty: number
|
|
245
234
|
|
|
@@ -247,43 +236,43 @@ export class OrderProduct {
|
|
|
247
236
|
@Field({ nullable: true })
|
|
248
237
|
adjustedPackQty: number
|
|
249
238
|
|
|
250
|
-
@Column('float', { nullable: true })
|
|
239
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
251
240
|
@Field({ nullable: true })
|
|
252
241
|
actualPackQty: number
|
|
253
242
|
|
|
254
|
-
@Column('float', { nullable: true })
|
|
243
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
255
244
|
@Field({ nullable: true })
|
|
256
245
|
unpackQty: number
|
|
257
246
|
|
|
258
|
-
@Column('float', { nullable: true })
|
|
247
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
259
248
|
@Field({ nullable: true })
|
|
260
249
|
unitPrice: number
|
|
261
250
|
|
|
262
|
-
@Column('float', { nullable: true })
|
|
251
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
263
252
|
@Field({ nullable: true })
|
|
264
253
|
adjustedUnitPrice: number
|
|
265
254
|
|
|
266
|
-
@Column('float', { nullable: true })
|
|
255
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
267
256
|
@Field({ nullable: true })
|
|
268
257
|
discountAmt: number
|
|
269
258
|
|
|
270
|
-
@Column('float', { nullable: true })
|
|
259
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
271
260
|
@Field({ nullable: true })
|
|
272
261
|
taxRate: number
|
|
273
262
|
|
|
274
|
-
@Column('float', { nullable: true })
|
|
263
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
275
264
|
@Field({ nullable: true })
|
|
276
265
|
miscAmt: number
|
|
277
266
|
|
|
278
|
-
@Column('float', { nullable: true })
|
|
267
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
279
268
|
@Field({ nullable: true })
|
|
280
269
|
palletQty: number
|
|
281
270
|
|
|
282
|
-
@Column('float', { nullable: true })
|
|
271
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
283
272
|
@Field({ nullable: true })
|
|
284
273
|
adjustedPalletQty: number
|
|
285
274
|
|
|
286
|
-
@Column('float', { nullable: true })
|
|
275
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
287
276
|
@Field({ nullable: true })
|
|
288
277
|
actualPalletQty: number
|
|
289
278
|
|
|
@@ -295,11 +284,11 @@ export class OrderProduct {
|
|
|
295
284
|
@Field({ nullable: true })
|
|
296
285
|
adjustedTotalUomValue: string
|
|
297
286
|
|
|
298
|
-
@Column({ nullable: true, type: 'float' })
|
|
287
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
299
288
|
@Field({ nullable: true })
|
|
300
289
|
releaseQty: number
|
|
301
290
|
|
|
302
|
-
@Column({ nullable: true, type: 'float' })
|
|
291
|
+
@Column({ nullable: true, type: 'float', transformer: roundTransformer })
|
|
303
292
|
@Field({ nullable: true })
|
|
304
293
|
releaseUomValue: number
|
|
305
294
|
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
2
|
-
import {
|
|
3
|
-
Column,
|
|
4
|
-
CreateDateColumn,
|
|
5
|
-
Entity,
|
|
6
|
-
Index,
|
|
7
|
-
ManyToOne,
|
|
8
|
-
PrimaryGeneratedColumn,
|
|
9
|
-
RelationId,
|
|
10
|
-
UpdateDateColumn
|
|
11
|
-
} from 'typeorm'
|
|
2
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
12
3
|
|
|
13
4
|
import { User } from '@things-factory/auth-base'
|
|
14
5
|
import { Bizplace } from '@things-factory/biz-base'
|
|
15
6
|
import { Product } from '@things-factory/product-base'
|
|
16
|
-
import { Domain } from '@things-factory/shell'
|
|
7
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
17
8
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
18
9
|
|
|
19
10
|
import { ArrivalNotice } from '../arrival-notice/arrival-notice'
|
|
@@ -86,11 +77,11 @@ export class OrderVas {
|
|
|
86
77
|
@Field({ nullable: true })
|
|
87
78
|
actualQty: number
|
|
88
79
|
|
|
89
|
-
@Column('float', { nullable: true })
|
|
80
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
90
81
|
@Field({ nullable: true })
|
|
91
82
|
uomValue: number
|
|
92
83
|
|
|
93
|
-
@Column('float', { nullable: true })
|
|
84
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
94
85
|
@Field({ nullable: true })
|
|
95
86
|
actualUomValue: number
|
|
96
87
|
|
|
@@ -1,27 +1,13 @@
|
|
|
1
1
|
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
2
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
3
3
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
4
|
-
import {
|
|
5
|
-
Column,
|
|
6
|
-
CreateDateColumn,
|
|
7
|
-
Entity,
|
|
8
|
-
Index,
|
|
9
|
-
ManyToOne,
|
|
10
|
-
PrimaryGeneratedColumn,
|
|
11
|
-
RelationId,
|
|
12
|
-
UpdateDateColumn
|
|
13
|
-
} from 'typeorm'
|
|
4
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
14
5
|
import { PurchaseOrder } from '../'
|
|
15
6
|
|
|
16
7
|
@Entity()
|
|
17
|
-
@Index(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
purchaseOrderOtherCharge.domain,
|
|
21
|
-
purchaseOrderOtherCharge.id
|
|
22
|
-
],
|
|
23
|
-
{ unique: true }
|
|
24
|
-
)
|
|
8
|
+
@Index('ix_purchase_order_other_charge_0', (purchaseOrderOtherCharge: PurchaseOrderOtherCharge) => [purchaseOrderOtherCharge.domain, purchaseOrderOtherCharge.id], {
|
|
9
|
+
unique: true
|
|
10
|
+
})
|
|
25
11
|
@ObjectType()
|
|
26
12
|
export class PurchaseOrderOtherCharge {
|
|
27
13
|
@PrimaryGeneratedColumn('uuid')
|
|
@@ -50,7 +36,7 @@ export class PurchaseOrderOtherCharge {
|
|
|
50
36
|
@RelationId((otherCharge: PurchaseOrderOtherCharge) => otherCharge.purchaseOrder)
|
|
51
37
|
purchaseOrderId: string
|
|
52
38
|
|
|
53
|
-
@Column('float', { nullable: true })
|
|
39
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
54
40
|
@Field({ nullable: true })
|
|
55
41
|
totalAmt: number
|
|
56
42
|
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
2
|
-
import {
|
|
3
|
-
Column,
|
|
4
|
-
CreateDateColumn,
|
|
5
|
-
Entity,
|
|
6
|
-
Index,
|
|
7
|
-
ManyToOne,
|
|
8
|
-
PrimaryGeneratedColumn,
|
|
9
|
-
RelationId,
|
|
10
|
-
UpdateDateColumn
|
|
11
|
-
} from 'typeorm'
|
|
2
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
12
3
|
|
|
13
4
|
import { User } from '@things-factory/auth-base'
|
|
14
5
|
import { Bizplace } from '@things-factory/biz-base'
|
|
15
6
|
import { Product } from '@things-factory/product-base'
|
|
16
|
-
import { Domain } from '@things-factory/shell'
|
|
7
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
17
8
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
18
9
|
|
|
19
10
|
import { ReverseKittingOrder } from '../reverse-kitting-order/reverse-kitting-order'
|
|
@@ -22,10 +13,7 @@ import { Vas } from '../vas/vas'
|
|
|
22
13
|
@Entity()
|
|
23
14
|
@Index(
|
|
24
15
|
'ix_reverse_kitting_order_inventory_0',
|
|
25
|
-
(reverseKittingOrderInventory: ReverseKittingOrderInventory) => [
|
|
26
|
-
reverseKittingOrderInventory.domain,
|
|
27
|
-
reverseKittingOrderInventory.name
|
|
28
|
-
],
|
|
16
|
+
(reverseKittingOrderInventory: ReverseKittingOrderInventory) => [reverseKittingOrderInventory.domain, reverseKittingOrderInventory.name],
|
|
29
17
|
{ unique: true }
|
|
30
18
|
)
|
|
31
19
|
@ObjectType({ description: 'Entity for ReverseKittingOrderInventory' })
|
|
@@ -63,7 +51,7 @@ export class ReverseKittingOrderInventory {
|
|
|
63
51
|
@Field({ nullable: true })
|
|
64
52
|
qty?: number
|
|
65
53
|
|
|
66
|
-
@Column('float', { nullable: true })
|
|
54
|
+
@Column('float', { nullable: true, transformer: roundTransformer })
|
|
67
55
|
@Field({ nullable: true })
|
|
68
56
|
uomValue?: number
|
|
69
57
|
|
|
@@ -71,9 +59,7 @@ export class ReverseKittingOrderInventory {
|
|
|
71
59
|
@Field(type => ReverseKittingOrder)
|
|
72
60
|
reverseKittingOrder: ReverseKittingOrder
|
|
73
61
|
|
|
74
|
-
@RelationId(
|
|
75
|
-
(reverseKittingOrderInventory: ReverseKittingOrderInventory) => reverseKittingOrderInventory.reverseKittingOrder
|
|
76
|
-
)
|
|
62
|
+
@RelationId((reverseKittingOrderInventory: ReverseKittingOrderInventory) => reverseKittingOrderInventory.reverseKittingOrder)
|
|
77
63
|
reverseKittingOrderId?: string
|
|
78
64
|
|
|
79
65
|
@Column({ nullable: true })
|
|
@@ -1,16 +1,7 @@
|
|
|
1
1
|
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
2
|
+
import { Domain, roundTransformer } from '@things-factory/shell'
|
|
3
3
|
import { Field, ID, ObjectType } from 'type-graphql'
|
|
4
|
-
import {
|
|
5
|
-
Column,
|
|
6
|
-
CreateDateColumn,
|
|
7
|
-
Entity,
|
|
8
|
-
Index,
|
|
9
|
-
ManyToOne,
|
|
10
|
-
PrimaryGeneratedColumn,
|
|
11
|
-
RelationId,
|
|
12
|
-
UpdateDateColumn
|
|
13
|
-
} from 'typeorm'
|
|
4
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
|
|
14
5
|
|
|
15
6
|
@Entity('vass')
|
|
16
7
|
@Index('ix_vas_0', (vas: Vas) => [vas.domain, vas.name], { unique: true })
|
|
@@ -47,7 +38,7 @@ export class Vas {
|
|
|
47
38
|
@Field({ nullable: true })
|
|
48
39
|
type: string
|
|
49
40
|
|
|
50
|
-
@Column('float')
|
|
41
|
+
@Column('float', { transformer: roundTransformer })
|
|
51
42
|
@Field()
|
|
52
43
|
defaultPrice: number
|
|
53
44
|
|