@things-factory/sales-base 4.3.0-alpha.1 → 4.3.0

package/server/service/draft-release-good/draft-release-good.ts

@@ -0,0 +1,270 @@
+import { Field, ID, Float, ObjectType, registerEnumType } from 'type-graphql'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToMany,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { Attachment } from '@things-factory/attachment-base'
+import { User } from '@things-factory/auth-base'
+import { Bizplace, ContactPoint } from '@things-factory/biz-base'
+import { config } from '@things-factory/env'
+import { Domain } from '@things-factory/shell'
+
+import { OrderProduct, ReleaseGood, ShippingOrder, ShippingOrderInfo } from '../'
+import { ReleaseOrderType } from '../../constants'
+
+const ORMCONFIG = config.get('ormconfig', {})
+const DATABASE_TYPE = ORMCONFIG.type
+
+// export enum DraftReleaseGoodStatus {
+//   STATUS_A = 'STATUS_A',
+//   STATUS_B = 'STATUS_B'
+// }
+
+// registerEnumType(DraftReleaseGoodStatus, {
+//   name: 'DraftReleaseGoodStatus',
+//   description: 'state enumeration of a draftReleaseGood'
+// })
+
+@Entity()
+@Index(
+  'ix_draft_release_good_0',
+  (draftReleaseGood: DraftReleaseGood) => [draftReleaseGood.domain, draftReleaseGood.name],
+  { unique: true }
+)
+@ObjectType({ description: 'Entity for DraftReleaseGood' })
+export class DraftReleaseGood {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @ManyToOne(type => Domain)
+  @Field(type => Domain, { nullable: true })
+  domain: Domain
+
+  @RelationId((draftReleaseGood: DraftReleaseGood) => draftReleaseGood.domain)
+  domainId: string
+
+  @ManyToOne(type => Bizplace)
+  @Field(type => Bizplace, { nullable: true })
+  bizplace: Bizplace
+
+  @RelationId((draftReleaseGood: DraftReleaseGood) => draftReleaseGood.bizplace)
+  bizplaceId: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  name: string
+
+  @OneToOne(type => ReleaseGood)
+  @JoinColumn()
+  @Field(type => ReleaseGood, { nullable: true })
+  releaseGood: ReleaseGood
+
+  @RelationId((draftReleaseGood: DraftReleaseGood) => draftReleaseGood.releaseGood)
+  releaseGoodId: string
+
+  @OneToOne(type => ShippingOrder)
+  @JoinColumn()
+  @Field(type => ShippingOrder, { nullable: true })
+  shippingOrder: ShippingOrder
+
+  @RelationId((releaseGood: ReleaseGood) => releaseGood.shippingOrder)
+  shippingOrderId: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  collectionOrderNo: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  description: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  truckNo: string
+
+  @Column({
+    type:
+      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'enum'
+        : DATABASE_TYPE == 'oracle'
+          ? 'varchar2'
+          : 'smallint',
+    enum: ReleaseOrderType,
+    default: ReleaseOrderType.B2B
+  })
+  @Field()
+  type: ReleaseOrderType
+
+  @Column({ default: false })
+  @Field()
+  exportOption: Boolean
+
+  @Column({ default: false })
+  @Field()
+  courierOption: Boolean
+
+  @Column({ default: false })
+  @Field()
+  packingOption: Boolean
+
+  @Column()
+  @Field()
+  ownTransport: Boolean
+
+  @Field(type => ShippingOrderInfo, { nullable: true })
+  shippingOrderInfo?: ShippingOrderInfo
+
+  @OneToMany(type => OrderProduct, orderProduct => orderProduct.draftReleaseGood)
+  @Field(type => [OrderProduct], { nullable: true })
+  orderProducts: OrderProduct[]
+
+  @Column()
+  @Field()
+  status: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  refNo: String
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  refNo2: String
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  refNo3: String
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  releaseDate: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  remark: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  marketplaceOrderStatus: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingAddress: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  pickupAddress: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  pickupTime: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  handoverType: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  dropoffAddress: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress1: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress2: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress3: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress4: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress5: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  attentionTo: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  attentionCompany: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  city: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  state: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  postalCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  country: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  phone1: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  phone2: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  email: string
+
+  @ManyToOne(type => ContactPoint)
+  @Field(type => ContactPoint, { nullable: true })
+  deliverTo: ContactPoint
+
+  @RelationId((draftReleaseGood: DraftReleaseGood) => draftReleaseGood.deliverTo)
+  deliverToId: string
+
+  @Field(type => [Attachment], { nullable: true })
+  attachment?: Attachment[]
+
+  @CreateDateColumn()
+  @Field()
+  createdAt: Date
+
+  @UpdateDateColumn()
+  @Field()
+  updatedAt: Date
+
+  @ManyToOne(type => User)
+  @Field(type => User, { nullable: true })
+  creator: User
+
+  @RelationId((draftReleaseGood: DraftReleaseGood) => draftReleaseGood.creator)
+  creatorId: string
+
+  @ManyToOne(type => User)
+  @Field(type => User, { nullable: true })
+  updater: User
+
+  @RelationId((draftReleaseGood: DraftReleaseGood) => draftReleaseGood.updater)
+  updaterId: string
+
+  @Field()
+  computedStatus: string
+}

package/server/service/draft-release-good/index.ts

@@ -0,0 +1,9 @@
+import { DraftReleaseGood } from './draft-release-good'
+import { DraftReleaseGoodQuery } from './draft-release-good-query'
+import { DraftReleaseGoodMutation } from './draft-release-good-mutation'
+
+export const entities = [DraftReleaseGood]
+export const resolvers = [DraftReleaseGoodQuery, DraftReleaseGoodMutation]
+
+export * from './draft-release-good-mutation'
+export * from './draft-release-good-query'

package/server/service/index.ts

@@ -10,6 +10,7 @@ import { entities as InvoiceEntity, resolvers as InvoiceResolvers } from './invo
 import { entities as InvoiceProductEntity, resolvers as InvoiceProductResolvers } from './invoice-product'
 import { entities as JobSheetEntity, resolvers as JobSheetResolvers } from './job-sheet'
 /* IMPORT ENTITIES AND RESOLVERS */
+import { entities as DraftReleaseGoodEntities, resolvers as DraftReleaseGoodResolvers } from './draft-release-good'
 import { entities as ManifestEntities, resolvers as ManifestResolvers } from './manifest'
 import { entities as OrderInventoryEntity, resolvers as OrderInventoryResolvers } from './order-inventory'
 import { entities as OrderProductEntity, resolvers as OrderProductResolvers } from './order-product'
@@ -17,8 +18,7 @@ import { entities as OrderVasEntity, resolvers as OrderVasResolvers } from './or
 import { resolvers as OthersResolvers } from './others'
 import { entities as PurchaseOrderEntity, resolvers as PurchaseOrderResolvers } from './purchase-order'
 import {
-  entities as PurchaseOrderOtherChargeEntity,
-  resolvers as PurchaseOrderOtherChargeResolvers
+  entities as PurchaseOrderOtherChargeEntity, resolvers as PurchaseOrderOtherChargeResolvers
 } from './purchase-order-other-charge'
 import { entities as ReleaseGoodEntity, resolvers as ReleaseGoodResolvers } from './release-good'
 import {
@@ -38,22 +38,26 @@ import { entities as ShippingOrderEntity, resolvers as ShippingOrderResolvers }
 import { entities as TransferOrderEntity, resolvers as TransferOrderResolvers } from './transfer-order'
 import { entities as VasEntity, resolvers as VasResolvers } from './vas'
 import { entities as VasOrderEntity, resolvers as VasOrderResolvers } from './vas-order'
+import { entities as OrderToteEntity, resolvers as OrderToteResolvers } from './order-tote'
+import { entities as OrderToteItemEntity, resolvers as OrderToteItemResolvers } from './order-tote-item'
+import { entities as OrderToteSealEntity, resolvers as OrderToteSealResolvers } from './order-tote-seal'
+import { OrderTote } from './order-tote/order-tote'
+import { OrderToteSeal } from './order-tote-seal/order-tote-seal'
 
 /* EXPORT ENTITY TYPES */
-export * from './manifest/manifest'
-export * from './reverse-kitting-order-inventory/reverse-kitting-order-inventory'
-export * from './reverse-kitting-order/reverse-kitting-order'
 export * from './arrival-notice/arrival-notice'
 export * from './claim-detail/claim-detail'
 export * from './claim-order/claim-order'
 export * from './claim/claim'
 export * from './collection-order/collection-order'
 export * from './delivery-order/delivery-order'
+export * from './draft-release-good/draft-release-good'
 export * from './goods-receival-note/goods-receival-note'
 export * from './inventory-check/inventory-check'
-export * from './invoice/invoice'
 export * from './invoice-product/invoice-product'
+export * from './invoice/invoice'
 export * from './job-sheet/job-sheet'
+export * from './manifest/manifest'
 export * from './order-inventory/order-inventory'
 export * from './order-product/order-product'
 export * from './order-vas/order-vas'
@@ -62,10 +66,15 @@ export * from './purchase-order/purchase-order'
 export * from './release-good/release-good'
 export * from './retail-replenishment-order/retail-replenishment-order'
 export * from './return-order/return-order'
+export * from './reverse-kitting-order-inventory/reverse-kitting-order-inventory'
+export * from './reverse-kitting-order/reverse-kitting-order'
 export * from './shipping-order/shipping-order'
 export * from './transfer-order/transfer-order'
 export * from './vas-order/vas-order'
 export * from './vas/vas'
+export * from './order-tote/order-tote'
+export * from './order-tote-item/order-tote-item'
+export * from './order-tote-seal/order-tote-seal'
 
 /* EXPORT TYPES */
 export * from './arrival-notice/arrival-notice-types'
@@ -74,10 +83,11 @@ export * from './claim-order/claim-order-types'
 export * from './claim/claim-types'
 export * from './collection-order/collection-order-types'
 export * from './delivery-order/delivery-order-types'
+export * from './draft-release-good/draft-release-good-type'
 export * from './goods-receival-note/goods-receival-note-types'
 export * from './inventory-check/inventory-check-types'
-export * from './invoice/invoice-types'
 export * from './invoice-product/invoice-product-types'
+export * from './invoice/invoice-types'
 export * from './job-sheet/job-sheet-types'
 export * from './order-inventory/order-inventory-types'
 export * from './order-product/order-product-types'
@@ -92,6 +102,10 @@ export * from './shipping-order/shipping-order-types'
 export * from './transfer-order/transfer-order-types'
 export * from './vas-order/vas-order-types'
 export * from './vas/vas-types'
+export * from './order-tote/order-tote-types'
+export * from './order-tote-item/order-tote-item-types'
+export * from './order-tote-seal/order-tote-seal-types'
+
 
 /* EXPORT MUTATIONS */
 export * from './arrival-notice/arrival-notice-mutation'
@@ -100,10 +114,11 @@ export * from './claim-order/claim-order-mutation'
 export * from './claim/claim-mutation'
 export * from './collection-order/collection-order-mutation'
 export * from './delivery-order/delivery-order-mutation'
+export * from './draft-release-good/draft-release-good-mutation'
 export * from './goods-receival-note/goods-receival-note-mutation'
 export * from './inventory-check/inventory-check-mutation'
-export * from './invoice/invoice-mutation'
 export * from './invoice-product/invoice-product-mutation'
+export * from './invoice/invoice-mutation'
 export * from './job-sheet/job-sheet-mutation'
 export * from './order-inventory/order-inventory-mutation'
 export * from './order-product/order-product-mutation'
@@ -117,6 +132,9 @@ export * from './shipping-order/shipping-order-mutation'
 export * from './transfer-order/transfer-order-mutation'
 export * from './vas-order/vas-order-mutation'
 export * from './vas/vas-mutation'
+export * from './order-tote/order-tote-mutation'
+export * from './order-tote-item/order-tote-item-mutation'
+export * from './order-tote-seal/order-tote-seal-mutation'
 
 /* EXPORT QUERIES */
 export * from './arrival-notice/arrival-notice-query'
@@ -125,10 +143,11 @@ export * from './claim-order/claim-order-query'
 export * from './claim/claim-query'
 export * from './collection-order/collection-order-query'
 export * from './delivery-order/delivery-order-query'
+export * from './draft-release-good/draft-release-good-query'
 export * from './goods-receival-note/goods-receival-note-query'
 export * from './inventory-check/inventory-check-query'
-export * from './invoice/invoice-query'
 export * from './invoice-product/invoice-product-query'
+export * from './invoice/invoice-query'
 export * from './job-sheet/job-sheet-query'
 export * from './order-inventory/order-inventory-query'
 export * from './order-product/order-product-query'
@@ -143,23 +162,25 @@ export * from './shipping-order/shipping-order-query'
 export * from './transfer-order/transfer-order-query'
 export * from './vas-order/vas-order-query'
 export * from './vas/vas-query'
+export * from './order-tote/order-tote-query'
+export * from './order-tote-item/order-tote-item-query'
+export * from './order-tote-seal/order-tote-seal-query'
 
 export const entities = [
   /* ENTITIES */
-  ...ManifestEntities,
-  ...ReverseKittingOrderInventoryEntities,
-  ...ReverseKittingOrderEntities,
   ...ArrivalNoticeEntity,
-  ...ClaimEntity,
   ...ClaimDetailEntity,
+  ...ClaimEntity,
   ...ClaimOrderEntity,
   ...CollectionOrderEntity,
   ...DeliveryOrderEntity,
+  ...DraftReleaseGoodEntities,
   ...GoodsReceivalNoteEntity,
   ...InventoryCheckEntity,
   ...InvoiceEntity,
   ...InvoiceProductEntity,
   ...JobSheetEntity,
+  ...ManifestEntities,
   ...OrderInventoryEntity,
   ...OrderProductEntity,
   ...OrderVasEntity,
@@ -168,41 +189,50 @@ export const entities = [
   ...ReleaseGoodEntity,
   ...RetailReplenishmentOrderEntity,
   ...ReturnOrderEntity,
+  ...ReverseKittingOrderEntities,
+  ...ReverseKittingOrderInventoryEntities,
   ...ShippingOrderEntity,
   ...TransferOrderEntity,
   ...VasEntity,
-  ...VasOrderEntity
+  ...VasOrderEntity,
+  ...OrderToteEntity,
+  ...OrderToteItemEntity,
+  ...OrderToteSealEntity
 ]
 
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
-    ...ManifestResolvers,
-    ...ReverseKittingOrderInventoryResolvers,
-    ...ReverseKittingOrderResolvers,
     ...ArrivalNoticeResolvers,
-    ...ClaimResolvers,
     ...ClaimDetailResolvers,
     ...ClaimOrderResolvers,
+    ...ClaimResolvers,
     ...CollectionOrderResolvers,
     ...DeliveryOrderResolvers,
+    ...DraftReleaseGoodResolvers,
     ...GoodsReceivalNoteResolvers,
     ...InventoryCheckResolvers,
-    ...InvoiceResolvers,
     ...InvoiceProductResolvers,
+    ...InvoiceResolvers,
     ...JobSheetResolvers,
+    ...ManifestResolvers,
     ...OrderInventoryResolvers,
     ...OrderProductResolvers,
     ...OrderVasResolvers,
     ...OthersResolvers,
-    ...PurchaseOrderResolvers,
     ...PurchaseOrderOtherChargeResolvers,
+    ...PurchaseOrderResolvers,
     ...ReleaseGoodResolvers,
     ...RetailReplenishmentOrderResolvers,
     ...ReturnOrderResolvers,
+    ...ReverseKittingOrderInventoryResolvers,
+    ...ReverseKittingOrderResolvers,
     ...ShippingOrderResolvers,
     ...TransferOrderResolvers,
     ...VasResolvers,
-    ...VasOrderResolvers
+    ...VasOrderResolvers,
+    ...OrderToteResolvers,
+    ...OrderToteItemResolvers,
+    ...OrderToteSealResolvers
   ]
 }

package/server/service/order-inventory/order-inventory-query.ts

@@ -1,17 +1,17 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Brackets, getRepository, Like, SelectQueryBuilder, In, Not, IsNull } from 'typeorm'
+import { Brackets, EntityManager, getRepository, Like, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
+import { Inventory, InventoryPatch, Location } from '@things-factory/warehouse-base'
 
 import { ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../constants'
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
 import { OrderInventoryList } from '../order-inventory/order-inventory-types'
 import { ReleaseGood } from '../release-good/release-good'
 import { OrderInventory } from './order-inventory'
-import { Location } from '@things-factory/warehouse-base'
 
 interface filterInterface {
   name: string
@@ -172,6 +172,44 @@ export class OrderInventoryQuery {
     })
   }
 
+  @Query(returns => Boolean)
+  async validateOrderInventory(
+    @Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[],
+    @Ctx() context: any
+  ) {
+    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+
+    let error = []
+
+    for (let i = 0; i < patches.length; i++) {
+      let foundExistingPallet: Inventory = await getRepository(Inventory).findOne({
+        where: { domain, palletId: patches[i]?.palletId }
+      })
+
+      if (!foundExistingPallet) {
+        foundExistingPallet = await getRepository(Inventory).findOne({
+          where: { id: patches[i]?.id }
+        })
+      }
+
+      if (patches[i]?.batchId != null) {
+        const worksheet: OrderInventory[] = await getRepository(OrderInventory).find({
+          where: { inventory: foundExistingPallet?.id, status: 'PICKING' }
+        })
+
+        if (worksheet.length > 0) {
+          error = [...worksheet]
+        }
+      }
+    }
+
+    if (error.length == 0) {
+      return true
+    } else {
+      return false
+    }
+  }
+
   @Query(returns => OrderInventoryList)
   async inventoriesByOrder(@Ctx() context: any, @Args() params: ListParam): Promise<OrderInventoryList> {
     const { domain, user }: { domain: Domain; user: User } = context.state

package/server/service/order-inventory/order-inventory-types.ts

@@ -158,6 +158,9 @@ export class OrderInventoryPatch {
   @Field(type => ObjectRef, { nullable: true })
   product: ObjectRef
 
+  @Field(type => ObjectRef, { nullable: true })
+  orderProduct: ObjectRef
+
   @Field({ nullable: true })
   batchId: string
 
@@ -197,6 +200,9 @@ export class OrderInventoryPatch {
   @Field({ nullable: true })
   productId: string
 
+  @Field({ nullable: true })
+  orderProductId: string
+
   @Field({ nullable: true })
   uom: string
 

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

@@ -37,11 +37,11 @@ import { TransferOrder } from '../transfer-order/transfer-order'
   ],
   { unique: true }
 )
-@Index(
-  'ix_order-inventory_2',
-  (orderInventory: OrderInventory) => [orderInventory.bizplace, orderInventory.deliveryOrder, orderInventory.inventory],
-  { unique: true }
-)
+@Index('ix_order-inventory_2', (orderInventory: OrderInventory) => [
+  orderInventory.bizplace,
+  orderInventory.deliveryOrder,
+  orderInventory.inventory
+])
 @Index(
   'ix_order-inventory_3',
   (orderInventory: OrderInventory) => [

package/server/service/order-product/order-product-types.ts

@@ -1,5 +1,7 @@
-import { ObjectRef, ScalarDate } from '@things-factory/shell'
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
+
+import { ObjectRef, ScalarDate } from '@things-factory/shell'
+
 import { OrderProduct } from './order-product'
 
 @ObjectType()
@@ -82,8 +84,8 @@ export class OrderProductPatch {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  product: ObjectRef
+  @Field(type => InboundProduct, { nullable: true })
+  product: InboundProduct
 
   @Field({ nullable: true })
   batchId: string

package/server/service/order-product/order-product.ts

@@ -1,4 +1,4 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import { Field, ID, ObjectType, Float } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -12,7 +12,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductBundle } from '@things-factory/product-base'
 import { Domain, ScalarDate } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -21,6 +21,7 @@ import { CollectionOrder } from '../collection-order/collection-order'
 import { DeliveryOrder } from '../delivery-order/delivery-order'
 import { PurchaseOrder } from '../purchase-order/purchase-order'
 import { ReleaseGood } from '../release-good/release-good'
+import { DraftReleaseGood } from '../draft-release-good/draft-release-good'
 import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
 
 @Entity()
@@ -102,6 +103,13 @@ export class OrderProduct {
   @RelationId((orderProduct: OrderProduct) => orderProduct.releaseGood)
   releaseGoodId: string
 
+  @ManyToOne(type => DraftReleaseGood)
+  @Field(type => DraftReleaseGood, { nullable: true })
+  draftReleaseGood: DraftReleaseGood
+
+  @RelationId((orderProduct: OrderProduct) => orderProduct.draftReleaseGood)
+  draftReleaseGoodId: string
+
   @ManyToOne(type => CollectionOrder)
   @Field(type => CollectionOrder, { nullable: true })
   collectionOrder: CollectionOrder
@@ -151,13 +159,20 @@ export class OrderProduct {
   @RelationId((orderProduct: OrderProduct) => orderProduct.toInventory)
   toInventoryId: string
 
-  @ManyToOne(type => Product, { nullable: false })
+  @ManyToOne(type => Product, { nullable: true })
   @Field(type => Product)
   product: Product
 
   @RelationId((orderProduct: OrderProduct) => orderProduct.product)
   productId: string
 
+  @ManyToOne(type => ProductBundle, { nullable: true })
+  @Field(type => ProductBundle)
+  productBundle: ProductBundle
+
+  @RelationId((orderProduct: OrderProduct) => orderProduct.productBundle)
+  productBundleId: string
+
   @Column()
   @Field()
   batchId: string
@@ -311,4 +326,16 @@ export class OrderProduct {
 
   @RelationId((orderProduct: OrderProduct) => orderProduct.updater)
   updaterId: string
+
+  @Field(type => Float, { nullable: true })
+  remainQty: number
+
+  @Field(type => Float, { nullable: true })
+  remainUomValue: number
+
+  @Field({ nullable: true })
+  remainUomValueWithUom: string
+
+  @Field({ nullable: true })
+  groupType: string
 }