@things-factory/sales-base 4.3.524 → 4.3.526

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

@@ -12,16 +12,12 @@ 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 { ReleaseGood, OrderPackage } from '../'
+import { OrderPackage } from '../order-package/order-package'
+
 
 @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')
@@ -35,13 +31,6 @@ 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
@@ -56,7 +45,7 @@ export class OrderConsignment {
     nullable: true
   })
   @Field({ nullable: true })
-  noOfPackages?: number
+  noOfPackages?: string
 
   @CreateDateColumn()
   @Field({ nullable: true })
@@ -86,11 +75,4 @@ 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

@@ -107,6 +107,10 @@ export class OrderPackage {
   @Field({ nullable: true })
   lmdOption: boolean
 
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  grossWeight: number
+
   @Column('float', { nullable: true })
   @Field({ nullable: true })
   calcWeight: number
@@ -123,7 +127,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-mutation.ts

@@ -1876,6 +1876,7 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
         refNo: item.refNo,
         refNo2: item.refNo2,
         refNo3: item.refNo3,
+        attentionCompany: item.attentionCompany,
         attentionTo: item.attentionTo,
         phone1: item.phone1,
         deliveryAddress1: item.deliveryAddress1,

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

@@ -1168,7 +1168,7 @@ function _extractData(rawData, validatedData) {
       raw.productInfo = data[idx].productInfo
       raw.packingType = data[idx].packingType
       raw.packingSize = data[idx].packingSize
-      raw.uom = data.uom
+      raw.uom = data[idx].uom
     } else {
       raw.assignedQty = 0
       raw.assignedUomValue = 0

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

@@ -26,7 +26,6 @@ import {
   DraftReleaseGood,
   InventoryInfos,
   Manifest,
-  OrderConsignment,
   OrderInventory,
   OrderPackage,
   OrderProduct,
@@ -190,10 +189,6 @@ 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,10 +62,6 @@ export class OrderNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}${randomString}`
   }
 
-  static orderConsignment() {
-    return `OC-${uuidv4()}`
-  }
-
   static orderInventory() {
     return uuidv4()
   }