@things-factory/sales-base 4.0.27 → 4.0.31

package/server/service/reverse-kitting-order/reverse-kitting-order-mutation.ts

@@ -10,12 +10,13 @@ import {
   InventoryHistory,
   InventoryNoGenerator,
   InventoryPatch,
-  InventoryUtil,
   Location,
   LOCATION_TYPE,
   Warehouse
 } from '@things-factory/warehouse-base'
 
+import { InventoryUtil } from '../../utils'
+
 import { ORDER_STATUS, ORDER_TYPES, ORDER_VAS_STATUS } from '../../constants'
 import { OrderNoGenerator } from '../../utils/order-no-generator'
 import { ReverseKittingOrderInventory } from '../reverse-kitting-order-inventory/reverse-kitting-order-inventory'

package/server/service/reverse-kitting-order/reverse-kitting-order-query.ts

@@ -34,14 +34,13 @@ export class ReverseKittingOrderQuery {
         'reverseKittingOrderInventories.inventory.product',
         'reverseKittingOrderInventories.inventory.location',
         'reverseKittingOrderInventories.inventory.warehouse',
-        'reverseKittingOrderInventories.targetProduct',
         'creator',
         'updater'
       ]
     })
   }
 
-  @Query(returns => ReverseKittingOrder, { description: 'To fetch a ReverseKittingOrder' })
+  @Query(returns => [ReverseKittingOrder], { description: 'To fetch a ReverseKittingOrder' })
   async reverseKittingInventories(
     @Arg('reverseKittingOIName') reverseKittingOIName: string,
     @Arg('productDetailId') productDetailId: string,

package/server/service/reverse-kitting-order/reverse-kitting-order-type.ts

@@ -13,8 +13,8 @@ import { ReverseKittingOrder } from './reverse-kitting-order'
 
 @InputType()
 export class NewReverseKittingOrder {
-  @Field()
-  name: string
+  @Field({ nullable: true })
+  name?: string
 
   @Field({ nullable: true })
   customerBizplaceId?: string

package/server/service/reverse-kitting-order/reverse-kitting-order.ts

@@ -1,4 +1,4 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import { Field, ID, ObjectType, Float, Int } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -14,6 +14,8 @@ import {
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
+import { Location } from '@things-factory/warehouse-base'
+import { Product } from '@things-factory/product-base'
 
 import { ReverseKittingOrderInventory } from '../reverse-kitting-order-inventory/reverse-kitting-order-inventory'
 
@@ -37,6 +39,7 @@ export class ReverseKittingOrder {
   domainId?: string
 
   @ManyToOne(type => Bizplace)
+  @Field(type => Bizplace, { nullable: true })
   bizplace: Bizplace
 
   @RelationId((reverseKittingOrder: ReverseKittingOrder) => reverseKittingOrder.bizplace)
@@ -57,9 +60,42 @@ export class ReverseKittingOrder {
   @Field({ nullable: true })
   remark?: string
 
-  @Column({ nullable: true })
   @Field({ nullable: true })
-  status: string
+  batchId?: string
+
+  @Field({ nullable: true })
+  packingType?: string
+
+  @Field(type => Float, { nullable: true })
+  packingSize?: number
+
+  @Column()
+  @Field({ nullable: true })
+  status?: string
+
+  @Field({ nullable: true })
+  batchIdRef?: string
+
+  @Field({ nullable: true })
+  palletId?: string
+
+  @Field({ nullable: true })
+  cartonId?: string
+
+  @Field(type => Int, { nullable: true })
+  qty?: number
+
+  @Field({ nullable: true })
+  expirationDate?: string
+
+  @Field(type => Location, { nullable: true })
+  location?: Location
+
+  @Field(type => Product, { nullable: true })
+  product?: Product
+
+  @Field({ nullable: true })
+  productDetailId?: string
 
   @CreateDateColumn()
   @Field({ nullable: true })

package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory-type.ts

@@ -27,7 +27,13 @@ export class NewReverseKittingOrderInventory {
   @Field(type => Float, { nullable: true })
   uomValue?: number
 
-  @Field(type => ObjectRef)
+  @Field({ nullable: true })
+  productName?: string
+
+  @Field({ nullable: true })
+  packingType?: string
+
+  @Field(type => ObjectRef, { nullable: true })
   reverseKittingOrder?: ObjectRef
 
   @Field(type => ObjectRef)

package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.ts

@@ -14,6 +14,8 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
+import { Product } from '@things-factory/product-base'
+import { Vas } from '@things-factory/sales-base'
 
 import { ReverseKittingOrder } from '../reverse-kitting-order/reverse-kitting-order'
 
@@ -93,6 +95,29 @@ export class ReverseKittingOrderInventory {
   @Field()
   status: string
 
+  @Field({ nullable: true })
+  targetType?: string
+
+  @Field({ nullable: true })
+  targetBatchId?: string
+
+  @ManyToOne(type => Product, { nullable: true })
+  @Field(type => Product, { nullable: true })
+  targetProduct?: Product
+
+  @ManyToOne(type => Vas, { nullable: true })
+  @Field(type => Vas, { nullable: true })
+  vas?: Vas
+
+  @Field({ nullable: true })
+  otherTarget?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  issue?: string
+
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt?: Date