@things-factory/sales-base 4.3.79-alpha.0 → 4.3.80-alpha.0

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

@@ -84,6 +84,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
 
@@ -225,6 +228,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
+
 }

package/server/service/others/other-query.ts

@@ -200,6 +200,7 @@ export class OtherQuery {
       const newOrderInventory: any = {
         product:
           total > 0 ? { id: items[0].productId, sku: items[0].productSKU, name: items[0].productName } : { id: null },
+        productDetail: total > 0 ? { id: items[0].productDetailId } : { id: null },
         inventory:
           total > 0
             ? {
@@ -210,6 +211,7 @@ export class OtherQuery {
               }
             : null,
         productId: total > 0 ? items[0].productId : null,
+        productDetailID: total > 0 ? items[0].productDetailId : null,
         productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
         productName: total > 0 ? items[0].productName : null,
         uom: total > 0 ? items[0].uom : null,
@@ -472,7 +474,7 @@ export class OtherQuery {
         let productDetail: ProductDetail
         const hasConditions: boolean = Boolean(
           (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-          (orderProduct?.uom && orderProduct?.uom.trim() != '')
+            (orderProduct?.uom && orderProduct?.uom.trim() != '')
         )
         let productDetailCondition: any = { product: foundProduct }
 
@@ -495,8 +497,8 @@ export class OtherQuery {
               ? productDetail.uomValue
               : null
             : orderProduct?.uomValue
-              ? orderProduct.uomValue
-              : productDetail.uomValue
+            ? orderProduct.uomValue
+            : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,
@@ -516,6 +518,7 @@ export class OtherQuery {
             primaryUnit: productDetail?.uom ? productDetail.uom : null,
             primaryValue: productDetail?.uomValue ? productDetail.uomValue : null
           },
+          productDetail,
           totalUomValue:
             orderProduct.packQty > 0
               ? uomValue

package/server/service/others/other-types.ts

@@ -19,6 +19,9 @@ export class InventoryProductGroup {
   @Field({ nullable: true })
   productId: string
 
+  @Field({ nullable: true })
+  productDetailId: string
+
   @Field({ nullable: true })
   batchId: string
 

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

@@ -69,7 +69,14 @@ export class PurchaseOrderMutation {
 
     const findPurchaseOrder: PurchaseOrder = await getRepository(PurchaseOrder).findOne({
       where: { domain, id },
-      relations: ['orderProducts', 'orderProducts.product', 'bufferLocation', 'bizplace', 'domain']
+      relations: [
+        'orderProducts',
+        'orderProducts.product',
+        'orderProducts.productDetail',
+        'bufferLocation',
+        'bizplace',
+        'domain'
+      ]
     })
 
     // const findPurchaseOrder: PurchaseOrder = await tx.getRepository(PurchaseOrder).findOne({id}, { relations:['bizplace']})
@@ -418,6 +425,7 @@ export async function upsertPurchaseOrderProducts(
     const bizplaceRepo: Repository<Product> = tx?.getRepository(Bizplace) || getRepository(Bizplace)
     const orderProductRepo: Repository<OrderProduct> = tx?.getRepository(OrderProduct) || getRepository(OrderProduct)
     const productRepo: Repository<Product> = tx?.getRepository(Product) || getRepository(Product)
+    const productDetailRepo: Repository<Product> = tx?.getRepository(ProductDetail) || getRepository(ProductDetail)
 
     // // Remove all existing order products that do not exist in current input
     let removeOP = purchaseOrder.orderProducts.filter(
@@ -443,6 +451,7 @@ export async function upsertPurchaseOrderProducts(
           bizplace: bizplace,
           name: op?.id ? op.name : OrderNoGenerator.orderProduct(),
           product: await productRepo.findOne(op.product.id),
+          productDetail: await productDetailRepo.findOne(op.productDetail.id),
           packingSize: foundProductDetail?.packingSize || 1,
           purchaseOrder: purchaseOrder,
           status: purchaseOrder.status,

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

@@ -62,6 +62,7 @@ export async function getPurchaseOrderFunction(_: any, name: any, context: any,
       'supplier',
       'orderProducts',
       'orderProducts.product',
+      'orderProducts.productDetail',
       'otherCharges',
       'bufferLocation',
       'bizplace',

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

@@ -16,7 +16,7 @@ import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder, MarketplaceProductVariation } from '@things-factory/marketplace-base'
 // import { sendNotification } from '@things-factory/notification'
-import { Product, ProductBundleSetting } from '@things-factory/product-base'
+import { Product, ProductBundleSetting, ProductDetail } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
@@ -722,7 +722,7 @@ export async function generateReleaseGoodFunction(
 
           const pbSettings: ProductBundleSetting[] = await tx.getRepository(ProductBundleSetting).find({
             where: { productBundle: oi.product.id },
-            relations: ['product', 'productBundle']
+            relations: ['product', 'productBundle', 'productDetail']
           })
 
           pbSettings.forEach(pbs => {
@@ -736,6 +736,9 @@ export async function generateReleaseGoodFunction(
                 id: pbs.product.id,
                 name: pbs.product.name,
                 groupType: PRODUCT_GROUP_TYPE.SINGLE
+              },
+              productDetail: {
+                id: pbs.productDetail.id
               }
             }
             splitBundleOIs.push(splitOI)
@@ -750,6 +753,10 @@ export async function generateReleaseGoodFunction(
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
 
     for (let oi of orderInventories) {
+      let productDetail: any = await tx
+        .getRepository(ProductDetail)
+        .findOne(oi.productDetail.id, { relations: ['product'] })
+
       let newOrderInv: OrderInventory = Object.assign({}, oi)
       newOrderInv = {
         ...newOrderInv,
@@ -758,7 +765,8 @@ export async function generateReleaseGoodFunction(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        product: await tx.getRepository(Product).findOne(oi.product.id),
+        product: productDetail.product,
+        productDetail,
         creator: user,
         updater: user
       }
@@ -796,9 +804,9 @@ export async function generateReleaseGoodFunction(
         }
 
         let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
-          newOrderInv.product,
           oi,
-          oi.packingType,
+          productDetail.product,
+          productDetail,
           locationSortingRules,
           bizplace,
           warehouseDomain,
@@ -1497,12 +1505,17 @@ export async function bulkGenerateReleaseGood(
         }
       }
 
-      const product: Product = await tx.getRepository(Product).findOne(oi.productId)
+      let productDetail = oi.orderProduct?.productDetail
+      let product = oi.orderProduct?.product
+      if (!productDetail) {
+        productDetail = await tx.getRepository(ProductDetail).findOne(oi.productDetailId, { relations: ['product'] })
+        product = productDetail.product
+      }
 
       let assignedResult = await InventoryUtil.autoAssignInventoryForRelease(
-        product,
         oi,
-        oi.packingType,
+        product,
+        productDetail,
         locationSortingRules,
         bizplace,
         warehouseDomain,

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

@@ -196,6 +196,7 @@ export class ReleaseGoodQuery {
           .createQueryBuilder('oi')
           .leftJoinAndSelect('oi.inventory', 'inventory')
           .leftJoinAndSelect('oi.product', 'product')
+          .leftJoinAndSelect('oi.productDetail', 'productDetail')
           .leftJoinAndSelect('inventory.location', 'location')
           .where('oi.domain_id = :domainId', { domainId: domain.id })
           .andWhere('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
@@ -226,6 +227,7 @@ export class ReleaseGoodQuery {
                 batchIdRef: inventory.batchIdRef,
                 palletId: inventory.palletId,
                 product: orderInv.product,
+                productDetail: orderInv.productDetail,
                 productIdRef: orderInv.product.id,
                 productName: `${orderInv.product.name} (${orderInv.product.description})`,
                 packingType: orderInv.packingType,
@@ -375,10 +377,7 @@ export class ReleaseGoodQuery {
         params.filters.push({
           name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
           operator: 'gte',
-          value:
-            typeFilter == 'b2c'
-              ? releaseDateFrom
-              : fromDateVal.toISOString(),
+          value: typeFilter == 'b2c' ? releaseDateFrom : fromDateVal.toISOString(),
           relation: false
         })
       }
@@ -393,9 +392,7 @@ export class ReleaseGoodQuery {
           name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
           operator: typeFilter == 'b2c' ? 'lte' : 'lt',
           value:
-            typeFilter == 'b2c'
-              ? releaseDateTo
-              : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+            typeFilter == 'b2c' ? releaseDateTo : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
           relation: false
         })
       }

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

@@ -1,6 +1,6 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
@@ -77,6 +77,9 @@ export class InventoryInfos {
   @Field(type => Product, { nullable: true })
   product?: Product
 
+  @Field(type => ProductDetail, { nullable: true })
+  productDetail?: ProductDetail
+
   @Field({ nullable: true })
   packingType?: string
 
@@ -185,8 +188,6 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   orderMethod: string
 
-
-
   @Field({ nullable: true })
   collectionOrderNo: string
 

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

@@ -6,7 +6,7 @@ import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
 import { sendNotification } from '@things-factory/notification'
-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'
 
@@ -59,6 +59,7 @@ export class ReturnOrderMutation {
         itm =>
           itm.product.id === curr.product.id &&
           itm.packingType === curr.packingType &&
+          itm.productDetailId === curr.product.productDetailId &&
           itm.batchId === curr.batchId &&
           itm.packingSize === curr.packingSize
       )
@@ -99,6 +100,7 @@ export class ReturnOrderMutation {
       newOrderInv.name = OrderNoGenerator.orderInventory()
       newOrderInv.returnOrder = createdReturnOrder
       newOrderInv.product = await tx.getRepository(Product).findOne(moi.product.id)
+      newOrderInv.productDetail = await tx.getRepository(ProductDetail).findOne(moi.productDetail.id)
       newOrderInv.creator = user
       newOrderInv.updater = user
 

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

@@ -115,6 +115,7 @@ export class NewReturnOrder {
   @Field({ nullable: true })
   truckNo: string
 
+
   @Field({ nullable: true })
   deliveryOrderNo: string
 

package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.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'
 
@@ -127,6 +127,10 @@ export class ReverseKittingOrderInventory {
   @Field({ nullable: true })
   updatedAt?: Date
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator?: User