@things-factory/sales-base 4.3.137 → 4.3.138

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

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import { Invoice } from '../invoice/invoice'
@@ -77,6 +77,10 @@ export class InvoiceProduct {
   @Field({ nullable: true })
   shippingFeePaidByCustomer: number
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @CreateDateColumn()
   @Field()
   createdAt: Date

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

@@ -286,6 +286,7 @@ export class OrderInventoryQuery {
       .leftJoinAndSelect('oi.bizplace', 'bizplace')
       .leftJoinAndSelect('oi.inventory', 'inventory')
       .leftJoinAndSelect('inventory.product', 'product')
+      .leftJoinAndSelect('inventory.productDetail', 'productDetail')
       .leftJoinAndSelect('oi.creator', 'creator')
       .leftJoinAndSelect('oi.updater', 'updater')
 
@@ -299,6 +300,7 @@ export class OrderInventoryQuery {
         releaseGoodName: item.releaseGood.name,
         palletId: item.inventory.palletId,
         productId: item.inventory.product.id,
+        productDetailId: item.inventory.productDetail.id,
         productName: item.inventory.product.name,
         productSKU: item.inventory.product.sku,
         productBrand: item.inventory.product.brand,

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

@@ -41,6 +41,9 @@ export class NewOrderInventory {
   @Field(type => NewProduct, { nullable: true })
   product: NewProduct
 
+  @Field(type => ObjectRef, { nullable: true })
+  productDetail: ObjectRef
+
   @Field({ nullable: true })
   productSKU: string
 
@@ -200,6 +203,9 @@ export class OrderInventoryPatch {
   @Field({ nullable: true })
   productId: string
 
+  @Field({ nullable: true })
+  productDetailId: string
+
   @Field({ nullable: true })
   orderProductId: string
 

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

@@ -13,7 +13,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, ProductDetail} from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -341,6 +341,13 @@ export class OrderInventory {
   @Field({ nullable: true })
   loadedAt: Date
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
+  @Field({ nullable: true })
+  productDetailId: String
+
   @Field({ nullable: true })
   dispatchedAt: Date
 

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

@@ -26,6 +26,7 @@ export class OrderProductQuery {
 
     let qb: SelectQueryBuilder<OrderProduct> = await getRepository(OrderProduct).createQueryBuilder('op')
     qb.leftJoinAndSelect('op.product', 'product')
+      .leftJoinAndSelect('op.productDetail', 'productDetail')
       .leftJoinAndSelect('op.domain', 'domain')
       .leftJoinAndSelect('op.bizplace', 'bizplace')
       .leftJoinAndSelect('bizplace.company', 'company')

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

@@ -90,6 +90,9 @@ export class OrderProductPatch {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
+  @Field(type => ObjectRef, { nullable: true })
+  productDetail: ObjectRef
+
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 
@@ -231,6 +234,9 @@ export class NewOrderProduct {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
+  @Field(type => ObjectRef, { nullable: true })
+  productDetail: ObjectRef
+
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 

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

@@ -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, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -200,6 +200,10 @@ export class OrderVas {
   @Field()
   updatedAt: Date
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
   creator: User
@@ -213,4 +217,5 @@ export class OrderVas {
 
   @RelationId((orderVas: OrderVas) => orderVas.updater)
   updaterId: string
+
 }