@things-factory/sales-base 4.3.76 → 4.3.79-alpha.1

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,10 @@ export class OrderInventory {
   @Field({ nullable: true })
   loadedAt: Date
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @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

@@ -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
 

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

@@ -3,7 +3,7 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { EntityManager, getConnection, getRepository, In, Not, Repository } from 'typeorm'
 
 import { Attachment, createAttachments } from '@things-factory/attachment-base'
-import { Partner, Role, User } from '@things-factory/auth-base'
+import { ApplicationType, Partner, Role, User } from '@things-factory/auth-base'
 import {
   Bizplace,
   getDomainUsers,
@@ -14,10 +14,9 @@ import {
 import { generateId } from '@things-factory/id-rule-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { Sftp } from '@things-factory/integration-sftp'
 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'
@@ -485,20 +484,18 @@ export async function generateReleaseGoodFunction(
     await InventoryUtil.validateWarehousePartnersProductsQuantity(domain, bizplace, orderInventories, context, tx)
     /** End Validate Release Order Product Quantity Section */
 
-    if (releaseGood.type == 'b2c') {
-      const sellercraft: Sellercraft = await tx
-        .getRepository(Sellercraft)
-        .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-      let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-        where: { domain: bizplace.domain }
-      })
-
-      if (sellercraft) {
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
         await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
-      } else if (customerAvailableSftp) {
-      } else {
+        break
+
+      case ApplicationType.MMS:
         const refNo: string = releaseGood.refNo
         const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
           where: {
@@ -532,9 +529,62 @@ export async function generateReleaseGoodFunction(
             throw new Error('Existing release order found')
           }
         }
-      }
+        break
+
+      default:
+        break
     }
 
+    // if (releaseGood.type == 'b2c') {
+    //   const sellercraft: Sellercraft = await tx
+    //     .getRepository(Sellercraft)
+    //     .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+    //   let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
+    //     where: { domain: bizplace.domain }
+    //   })
+
+    //   if (sellercraft) {
+    //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+    //     await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
+    //   } else if (customerAvailableSftp) {
+    //   } else {
+    //     const refNo: string = releaseGood.refNo
+    //     const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+    //       where: {
+    //         domain: warehouseDomain,
+    //         refNo,
+    //         status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
+    //       },
+    //       relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
+    //     })
+
+    //     if (foundReleaseGood) {
+    //       const customerCompanyDomain: Domain = foundReleaseGood.bizplace.company.domain
+    //       const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+    //         where: { orderNo: refNo, domain: customerCompanyDomain }
+    //       })
+
+    //       // Need to restructure the validation
+    //       if (marketplaceOrder?.isSplitted) {
+    //         const refNo2: string = releaseGood.refNo2
+    //         const foundSplittedReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+    //           where: {
+    //             domain: warehouseDomain,
+    //             refNo2,
+    //             status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
+    //           },
+    //           relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
+    //         })
+
+    //         if (foundSplittedReleaseGood) throw new Error('Existing release order found')
+    //       } else {
+    //         throw new Error('Existing release order found')
+    //       }
+    //     }
+    //   }
+    // }
+
     let newReleaseGood: ReleaseGood = new ReleaseGood()
 
     /** Generate Shipping Order */
@@ -672,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 => {
@@ -686,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)
@@ -700,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,
@@ -708,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
       }
@@ -746,9 +804,9 @@ export async function generateReleaseGoodFunction(
         }
 
         let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
-          newOrderInv.product,
           oi,
-          oi.packingType,
+          productDetail.product,
+          productDetail,
           locationSortingRules,
           bizplace,
           warehouseDomain,
@@ -887,16 +945,28 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   let foundOVs: OrderVas[] = foundReleaseGood.orderVass
   let customerBizplace: Bizplace = foundReleaseGood.bizplace
   const companyDomain: Domain = customerBizplace?.company.domain
-  const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
-    where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
-    relations: ['domain']
-  })
 
-  if (foundReleaseGood.type == 'b2c') {
-    if (sellercraft) {
+  const orderSource: string = foundReleaseGood.source
+  switch (orderSource) {
+    case ApplicationType.SELLERCRAFT:
+      const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+        where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
+        relations: ['domain']
+      })
+
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
-    } else {
+      if (foundReleaseGood.type == 'b2c') {
+        foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, {
+          ...foundReleaseGood,
+          orderProducts: foundOPs
+        })
+      } else if (foundReleaseGood.type == 'b2b') {
+        await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
+      }
+
+      break
+
+    case ApplicationType.MMS:
       // find for any existing marketplace store connections
       let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
         where: { domain: companyDomain, status: 'ACTIVE' },
@@ -959,16 +1029,94 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
         const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
         await ecommerceCtrl.updateProductVariationStock(marketplaceStores, productIds, companyDomain)
       }
-    }
-  }
+      break
 
-  if (foundReleaseGood.type == 'b2b') {
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
-    }
+    default:
+      break
   }
 
+  // const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+  //   where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
+  //   relations: ['domain']
+  // })
+
+  // if (foundReleaseGood.type == 'b2c') {
+  //   if (sellercraft) {
+  //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+  //     foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
+  //   } else {
+  //     // find for any existing marketplace store connections
+  //     let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+  //       where: { domain: companyDomain, status: 'ACTIVE' },
+  //       relations: ['marketplaceDistributors']
+  //     })
+
+  //     const foundMarketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+  //       where: { domain: companyDomain, orderNo: foundReleaseGood.refNo },
+  //       relations: ['marketplaceStore']
+  //     })
+
+  //     let matchedMarketplaceStore: MarketplaceStore
+  //     if (foundMarketplaceOrder) {
+  //       matchedMarketplaceStore = marketplaceStores.filter(
+  //         marketplaceStore => marketplaceStore.id == foundMarketplaceOrder.marketplaceStore.id
+  //       )[0]
+  //     }
+
+  //     let combinedOrderInventories: any[] = foundOIs.map(oi => {
+  //       return {
+  //         sku: oi.product.sku,
+  //         releaseQty: oi.releaseQty
+  //       }
+  //     })
+
+  //     if (foundBundleInfo?.length) {
+  //       foundBundleInfo.map(bundle => {
+  //         combinedOrderInventories.push({
+  //           sku: bundle.sku,
+  //           releaseQty: bundle.releaseQty
+  //         })
+  //       })
+  //     }
+
+  //     for (let oi of combinedOrderInventories) {
+  //       let foundMarketplaceProductVariations: MarketplaceProductVariation[] = await tx
+  //         .getRepository(MarketplaceProductVariation)
+  //         .find({
+  //           where: { domain: companyDomain, sku: oi.sku },
+  //           relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+  //         })
+
+  //       if (foundMarketplaceProductVariations) {
+  //         await Promise.all(
+  //           foundMarketplaceProductVariations.map(async variation => {
+  //             if (variation.marketplaceProduct.marketplaceStore.reserveEnabled) {
+  //               variation.reserveQty -= oi.releaseQty
+  //             }
+
+  //             await tx.getRepository(MarketplaceProductVariation).save(variation)
+  //           })
+  //         )
+  //       }
+  //     }
+
+  //     if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+  //       marketplaceStores = marketplaceStores.filter(marketplaceStore => marketplaceStore.isAutoUpdateStockQty)
+  //       let productIds: string[] = foundOIs.map(oi => oi.product.id)
+  //       productIds = Array.from(new Set([...productIds]))
+  //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+  //       await ecommerceCtrl.updateProductVariationStock(marketplaceStores, productIds, companyDomain)
+  //     }
+  //   }
+  // }
+
+  // if (foundReleaseGood.type == 'b2b') {
+  //   if (sellercraft) {
+  //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+  //     await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
+  //   }
+  // }
+
   // 1. RO Status change (PENDING => PENDING_RECEIVE)
   const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).save({
     ...foundReleaseGood,
@@ -1183,15 +1331,32 @@ export async function rejectReleaseGood(
   }
 
   if (foundOPs && foundOPs.length) {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+        if (sellercraft) {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+          await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+        }
+        break
 
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+      default:
+        break
     }
 
+    // const sellercraft: Sellercraft = await tx
+    //   .getRepository(Sellercraft)
+    //   .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+    // if (sellercraft) {
+    //   const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+    //   await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+    // }
+
     await tx.getRepository(OrderProduct).save(
       await Promise.all(
         foundOPs.map(async (op: OrderProduct) => {
@@ -1288,6 +1453,7 @@ export async function bulkGenerateReleaseGood(
       phone1: releaseGood?.phone1 || null,
       phone2: releaseGood?.phone2 || null,
       email: releaseGood?.email || null,
+      source: releaseGood?.source || null,
       airwayBill: releaseGood?.airwayBill,
       refNo: releaseGood.refNo,
       refNo2: releaseGood.refNo2,
@@ -1296,8 +1462,8 @@ export async function bulkGenerateReleaseGood(
       ownTransport: releaseGood?.ownTransport || false,
       orderMethod: ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
-      creator: user,
-      updater: user
+      creator: releaseGood?.creator || user,
+      updater: releaseGood?.updater || user
     }
 
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
@@ -1339,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,
@@ -1370,8 +1541,8 @@ export async function bulkGenerateReleaseGood(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        creator: user,
-        updater: user
+        creator: newReleaseGood?.creator || user,
+        updater: newReleaseGood?.updater || user
       }
 
       let newOrderProduct: Partial<OrderProduct>
@@ -1393,8 +1564,8 @@ export async function bulkGenerateReleaseGood(
           actualPalletQty: 0,
           status: ORDER_PRODUCT_STATUS.ASSIGNED,
           releaseGood: newReleaseGood,
-          creator: user,
-          updater: user
+          creator: newReleaseGood?.creator || user,
+          updater: newReleaseGood?.updater || user
         }
 
         newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
@@ -1403,7 +1574,7 @@ export async function bulkGenerateReleaseGood(
           ...oi.orderProduct,
           totalUomValue: `${oi.orderProduct.releaseUomValue} ${oi.orderProduct.uom}`,
           status: ORDER_PRODUCT_STATUS.ASSIGNED,
-          updater: user
+          updater: newReleaseGood?.updater || user
         })
       }
 

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