@things-factory/sales-base 4.3.523 → 4.3.524

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

@@ -12,12 +12,16 @@ import {
 import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 
 import { Domain } from '@things-factory/shell'
+import { Bizplace } from '@things-factory/biz-base'
 import { User } from '@things-factory/auth-base'
-import { OrderPackage } from '../order-package/order-package'
-
+import { ReleaseGood, OrderPackage } from '../'
 
 @Entity()
-@Index('ix_order_consignment_0', (orderConsignment: OrderConsignment) => [orderConsignment.domain, orderConsignment.name], { unique: true })
+@Index(
+  'ix_order_consignment_0',
+  (orderConsignment: OrderConsignment) => [orderConsignment.domain, orderConsignment.name],
+  { unique: true }
+)
 @ObjectType({ description: 'Entity for OrderConsignment' })
 export class OrderConsignment {
   @PrimaryGeneratedColumn('uuid')
@@ -31,6 +35,13 @@ export class OrderConsignment {
   @RelationId((orderConsignment: OrderConsignment) => orderConsignment.domain)
   domainId?: string
 
+  @ManyToOne(type => Bizplace)
+  @Field({ nullable: true })
+  bizplace?: Domain
+
+  @RelationId((orderConsignment: OrderConsignment) => orderConsignment.bizplace)
+  bizplaceId?: string
+
   @Column()
   @Field()
   name: string
@@ -45,7 +56,7 @@ export class OrderConsignment {
     nullable: true
   })
   @Field({ nullable: true })
-  noOfPackages?: string
+  noOfPackages?: number
 
   @CreateDateColumn()
   @Field({ nullable: true })
@@ -75,4 +86,11 @@ export class OrderConsignment {
 
   @OneToMany(type => OrderPackage, orderPackage => orderPackage.orderConsignment)
   orderPackages: OrderPackage[]
+
+  @ManyToOne(type => ReleaseGood)
+  @Field(type => ReleaseGood, { nullable: true })
+  releaseGood?: ReleaseGood
+
+  @RelationId((orderConsignment: OrderConsignment) => orderConsignment.releaseGood)
+  releaseGoodId?: string
 }

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

@@ -123,7 +123,7 @@ export class OrderPackage {
   lastMileDeliveryId?: string
 
   @ManyToOne(type => OrderConsignment)
-  @Field(type => OrderConsignment, { nullable: true})
+  @Field(type => OrderConsignment, { nullable: true })
   orderConsignment: OrderConsignment
 
   @RelationId((orderPackage: OrderPackage) => orderPackage.orderConsignment)

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

@@ -26,6 +26,7 @@ import {
   DraftReleaseGood,
   InventoryInfos,
   Manifest,
+  OrderConsignment,
   OrderInventory,
   OrderPackage,
   OrderProduct,
@@ -189,6 +190,10 @@ export class ReleaseGood {
   @Field(type => [OrderPackage], { nullable: true })
   orderPackages: OrderPackage[]
 
+  @OneToMany(type => OrderConsignment, orderConsignment => orderConsignment.releaseGood)
+  @Field(type => [OrderConsignment], { nullable: true })
+  orderConsignments: OrderConsignment[]
+
   @Column()
   @Field()
   status: string

package/server/utils/order-no-generator.ts

@@ -62,6 +62,10 @@ export class OrderNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}${randomString}`
   }
 
+  static orderConsignment() {
+    return `OC-${uuidv4()}`
+  }
+
   static orderInventory() {
     return uuidv4()
   }