@things-factory/sales-base 4.3.94-alpha.1 → 4.3.96

package/server/service/arrival-notice/arrival-notice-mutation.ts

@@ -13,7 +13,7 @@ import {
 } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { sendNotification } from '@things-factory/notification'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -339,6 +339,7 @@ export class ArrivalNoticeMutation {
                 domain,
                 bizplace: foundBizplace,
                 name: OrderNoGenerator.orderProduct(),
+                // product: await childTx.getRepository(Product).findOne(op.product.id),
                 status: ORDER_PRODUCT_STATUS.PENDING,
                 arrivalNotice: createdArrivalNotice,
                 creator: user
@@ -973,7 +974,6 @@ export async function addArrivalNoticeProducts(
   tx?: EntityManager
 ): Promise<void> {
   const productRepo: Repository<Product> = tx?.getRepository(Product) || getRepository(Product)
-  const productDetailRepo: Repository<ProductDetail> = tx?.getRepository(ProductDetail) || getRepository(ProductDetail)
   const orderProductRepo: Repository<OrderProduct> = tx?.getRepository(OrderProduct) || getRepository(OrderProduct)
 
   if (!arrivalNotice?.bizplace || !arrivalNotice?.orderProducts?.length) {
@@ -991,7 +991,6 @@ export async function addArrivalNoticeProducts(
         bizplace: arrivalNotice.bizplace,
         name: OrderNoGenerator.orderProduct(),
         product: await productRepo.findOne(op.product.id),
-        productDetail: await productDetailRepo.findOne(op.productDetail.id),
         arrivalNotice,
         creator: user
       }
@@ -1059,10 +1058,8 @@ function extractArrivalNotices(rawArrivalNotices): Partial<ArrivalNotice[]> {
     })
 
     const product: Product = Object.assign(new Product(), { id: raw.productId, sku: raw.sku })
-    const productDetail: ProductDetail = Object.assign(new ProductDetail(), { id: raw.productDetailId })
     const orderProduct: Partial<OrderProduct> = {
       product,
-      productDetail,
       batchId: raw.batchId,
       batchIdRef: raw.batchIdRef,
       packingType: raw.packingType,
@@ -1073,7 +1070,7 @@ function extractArrivalNotices(rawArrivalNotices): Partial<ArrivalNotice[]> {
       totalUomValue: raw.totalUomValue,
       palletQty: raw.palletQty,
       unitPrice: raw.unitPrice,
-      manufactureDate: raw.manufactureDate,
+      manufactureDate: raw.manufactureDate
     }
 
     if (idx >= 0) {

package/server/service/arrival-notice/arrival-notice-types.ts

@@ -1,6 +1,6 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
-import { ObjectRef, ScalarDate } from '@things-factory/shell'
+import { ObjectRef } from '@things-factory/shell'
 
 import { NewOrderProduct } from '../order-product/order-product-types'
 import { NewOrderVas } from '../order-vas/order-vas-types'
@@ -125,6 +125,9 @@ export class NewArrivalNotice {
   @Field({ nullable: true })
   manufactureDate?: string
 
+  @Field({ nullable: true })
+  source?: string
+
   @Field({ nullable: true })
   errorMsg: string
 }

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

@@ -195,7 +195,6 @@ export class DraftReleaseGoodMutation {
       relations: [
         'orderProducts',
         'orderProducts.product',
-        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'shippingOrder',
         'bizplace',
@@ -263,7 +262,10 @@ export class DraftReleaseGoodMutation {
           draftOrder.orderProducts = draftOrder.orderProducts.map(itm => {
             let foundProductInv = productInventory.items.find(
               i =>
-                (i.productDetailId == itm?.productDetail?.id || i.productId == itm?.productBundle?.id) &&
+                (i.productId == itm?.product?.id || i.productId == itm?.productBundle?.id) &&
+                i.packingType == itm.packingType &&
+                i.packingSize == itm.packingSize &&
+                i.uom == itm.uom &&
                 itm.releaseQty <= i.remainQty
             )
             return {
@@ -633,7 +635,6 @@ export async function upsertDraftReleaseGoodProducts(
       relations: [
         'orderProducts',
         'orderProducts.product',
-        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'orderProducts.creator',
         'orderProducts.updater'

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

@@ -1,16 +1,20 @@
-import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, In, SelectQueryBuilder } from 'typeorm'
+import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root, Directive } from 'type-graphql'
+import { getRepository, SelectQueryBuilder, EntityManager, In, getManager } from 'typeorm'
 
-import { Attachment } from '@things-factory/attachment-base'
-import { User } from '@things-factory/auth-base'
-import { Bizplace, getPermittedBizplaceIds, getPermittedBizplaces } from '@things-factory/biz-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
+import { Bizplace, getPermittedBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { buildQuery, Domain, ListParam, Filter, Pagination, Sorting } from '@things-factory/shell'
 
-import { ATTACHMENT_TYPE, DRAFT_RELEASE_ORDER_STATUS } from '../../constants'
-import { InventoryUtil } from '../../utils'
+import { DRAFT_RELEASE_ORDER_STATUS, ORDER_STATUS } from '../../constants'
 import { DraftReleaseGood } from './draft-release-good'
 import { DraftReleaseGoodList } from './draft-release-good-type'
 
+import { Attachment } from '@things-factory/attachment-base'
+import { ATTACHMENT_TYPE } from '../../constants'
+
+import { InventoryUtil } from '../../utils'
+import { OrderProduct } from '../order-product/order-product'
+
 @Resolver(DraftReleaseGood)
 export class DraftReleaseGoodQuery {
   @Query(returns => DraftReleaseGood, { description: 'To fetch a DraftReleaseGood' })
@@ -110,10 +114,10 @@ export class DraftReleaseGoodQuery {
           where drg1.status ='DRAFT' AND drg1.domain_id = $1
           AND NOT EXISTS (
             SELECT * FROM warehouse_bizplace_onhand_inventories wboi 
-            where (wboi."product_id" = op.product_id or wboi."product_bundle_id" = op.product_id) 
-            and wboi."domain_id" = op.domain_id
-            and wboi."bizplace_id" = op.bizplace_id
-            AND wboi."remain_qty" >= op.release_qty
+            where (wboi."productId" = op.product_id or wboi."productBundleId" = op.product_id) 
+            and wboi."domainId" = op.domain_id
+            and wboi."bizplaceId" = op.bizplace_id
+            AND wboi."remainQty" >= op.release_qty
           ) GROUP BY drg1.id
         )
       `,
@@ -251,7 +255,6 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
         'releaseGood',
         'orderProducts',
         'orderProducts.product',
-        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'shippingOrder',
         'bizplace',
@@ -313,7 +316,11 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
 
     result.orderProducts = result.orderProducts.map(itm => {
       let foundProductInv = productInventory?.items.find(
-        i => i.productDetailId == itm?.productDetail?.id || i.productId == itm?.productBundle?.id
+        i =>
+          (i.productId == itm?.product?.id || i.productId == itm?.productBundle?.id) &&
+          i.packingType == itm.packingType &&
+          i.packingSize == itm.packingSize &&
+          i.uom == itm.uom
       )
       return {
         ...itm,
@@ -323,9 +330,6 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
           brand: foundProductInv.productBrand,
           sku: foundProductInv.productSKU
         },
-        productDetail: itm.productDetail || {
-          id: foundProductInv.productDetailId
-        },
         groupType: foundProductInv ? foundProductInv.groupType : 'SINGLE',
         remainQty: foundProductInv ? foundProductInv.remainQty : 0,
         remainUomValue: foundProductInv ? foundProductInv.remainUomValue : 0,

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

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import { Invoice } from '../invoice/invoice'
@@ -77,10 +77,6 @@ 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,7 +286,6 @@ 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')
 
@@ -300,7 +299,6 @@ 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,9 +41,6 @@ export class NewOrderInventory {
   @Field(type => NewProduct, { nullable: true })
   product: NewProduct
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field({ nullable: true })
   productSKU: string
 
@@ -203,9 +200,6 @@ 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, ProductDetail} from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -341,13 +341,6 @@ 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,7 +26,6 @@ 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,9 +84,6 @@ export class OrderProductPatch {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 
@@ -228,9 +225,6 @@ 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, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -200,10 +200,6 @@ 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
@@ -217,5 +213,4 @@ export class OrderVas {
 
   @RelationId((orderVas: OrderVas) => orderVas.updater)
   updaterId: string
-
 }

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

@@ -205,30 +205,32 @@ export class OtherQuery {
 
       let packageUomValue = availableItem ? availableItem.remainUomValue / availableItem.remainQty : null
       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
-            ? {
-              ...items[0],
-              remainQty: total > 0 ? items[0].remainQty : null,
-              remainUomValue: total > 0 ? items[0].remainUomValue : null,
-              remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
+        product: availableItem
+          ? {
+              id: availableItem.productId,
+              sku: availableItem.productSKU,
+              name: availableItem.productName
             }
-            : 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,
-        remainQty: total > 0 ? items[0].remainQty : null,
-        remainUomValue: total > 0 ? items[0].remainUomValue : null,
-        remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : '',
-        batchId: total > 0 ? items[0].batchId : null,
-        batchIdRef: total > 0 ? items[0].batchIdRef : null,
-        packingType: total > 0 ? items[0].packingType : orderInventory.packingType,
-        packingSize: total > 0 ? items[0].packingSize : 1,
+          : { id: null },
+        inventory: availableItem
+          ? {
+              ...availableItem,
+              remainQty: availableItem ? availableItem.remainQty : null,
+              remainUomValue: availableItem ? availableItem.remainUomValue : null,
+              remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : ''
+            }
+          : null,
+        productId: availableItem ? availableItem.productId : null,
+        productSKU: availableItem ? availableItem.productSKU : orderInventory.productSKU,
+        productName: availableItem ? availableItem.productName : null,
+        uom: availableItem ? availableItem.uom : null,
+        remainQty: availableItem ? availableItem.remainQty : null,
+        remainUomValue: availableItem ? availableItem.remainUomValue : null,
+        remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : '',
+        batchId: availableItem ? availableItem.batchId : null,
+        batchIdRef: availableItem ? availableItem.batchIdRef : null,
+        packingType: availableItem ? availableItem.packingType : orderInventory.packingType,
+        packingSize: availableItem ? availableItem.packingSize : 1,
         releaseQty: orderInventory.releaseQty
           ? Number.isInteger(orderInventory.releaseQty)
             ? orderInventory.releaseQty
@@ -352,7 +354,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 }
 
@@ -375,8 +377,8 @@ export class OtherQuery {
               ? productDetail.uomValue
               : null
             : orderProduct?.uomValue
-              ? orderProduct.uomValue
-              : productDetail.uomValue
+            ? orderProduct.uomValue
+            : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,
@@ -482,7 +484,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 }
 
@@ -505,8 +507,8 @@ export class OtherQuery {
               ? productDetail.uomValue
               : null
             : orderProduct?.uomValue
-              ? orderProduct.uomValue
-              : productDetail.uomValue
+            ? orderProduct.uomValue
+            : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,
@@ -526,7 +528,6 @@ 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,9 +19,6 @@ 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,14 +69,7 @@ export class PurchaseOrderMutation {
 
     const findPurchaseOrder: PurchaseOrder = await getRepository(PurchaseOrder).findOne({
       where: { domain, id },
-      relations: [
-        'orderProducts',
-        'orderProducts.product',
-        'orderProducts.productDetail',
-        'bufferLocation',
-        'bizplace',
-        'domain'
-      ]
+      relations: ['orderProducts', 'orderProducts.product', 'bufferLocation', 'bizplace', 'domain']
     })
 
     // const findPurchaseOrder: PurchaseOrder = await tx.getRepository(PurchaseOrder).findOne({id}, { relations:['bizplace']})
@@ -425,7 +418,6 @@ 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(
@@ -451,7 +443,6 @@ 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,7 +62,6 @@ 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, ProductDetail } from '@things-factory/product-base'
+import { Product, ProductBundleSetting } 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'
@@ -675,7 +675,7 @@ export async function generateReleaseGoodFunction(
 
           const pbSettings: ProductBundleSetting[] = await tx.getRepository(ProductBundleSetting).find({
             where: { productBundle: oi.product.id },
-            relations: ['product', 'productBundle', 'productDetail']
+            relations: ['product', 'productBundle']
           })
 
           pbSettings.forEach(pbs => {
@@ -689,9 +689,6 @@ 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)
@@ -706,10 +703,6 @@ 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,
@@ -718,8 +711,7 @@ export async function generateReleaseGoodFunction(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        product: productDetail.product,
-        productDetail,
+        product: await tx.getRepository(Product).findOne(oi.product.id),
         creator: user,
         updater: user
       }
@@ -757,9 +749,9 @@ export async function generateReleaseGoodFunction(
         }
 
         let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
+          newOrderInv.product,
           oi,
-          productDetail.product,
-          productDetail,
+          oi.packingType,
           locationSortingRules,
           bizplace,
           warehouseDomain,
@@ -1374,17 +1366,12 @@ export async function bulkGenerateReleaseGood(
         }
       }
 
-      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
-      }
+      const product: Product = await tx.getRepository(Product).findOne(oi.productId)
 
       let assignedResult = await InventoryUtil.autoAssignInventoryForRelease(
-        oi,
         product,
-        productDetail,
+        oi,
+        oi.packingType,
         locationSortingRules,
         bizplace,
         warehouseDomain,

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

@@ -196,7 +196,6 @@ 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 })
@@ -227,7 +226,6 @@ 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,
@@ -377,7 +375,10 @@ 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
         })
       }
@@ -392,7 +393,9 @@ 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, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
@@ -77,9 +77,6 @@ export class InventoryInfos {
   @Field(type => Product, { nullable: true })
   product?: Product
 
-  @Field(type => ProductDetail, { nullable: true })
-  productDetail?: ProductDetail
-
   @Field({ nullable: true })
   packingType?: string
 
@@ -188,6 +185,8 @@ 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, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -59,7 +59,6 @@ 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
       )
@@ -100,7 +99,6 @@ 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,7 +115,6 @@ export class NewReturnOrder {
   @Field({ nullable: true })
   truckNo: string
 
-
   @Field({ nullable: true })
   deliveryOrderNo: string