@things-factory/sales-base 4.3.81 → 4.3.82

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 } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -339,7 +339,6 @@ 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
@@ -974,6 +973,7 @@ 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,6 +991,7 @@ 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
       }
@@ -1058,8 +1059,10 @@ 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,
@@ -1070,7 +1073,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.ts

@@ -148,6 +148,10 @@ export class ArrivalNotice {
   @Field({ nullable: true })
   description: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  source: string
+
   @OneToOne(type => PurchaseOrder, { nullable: true })
   @JoinColumn()
   @Field(type => PurchaseOrder, { nullable: true })

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

@@ -195,6 +195,7 @@ export class DraftReleaseGoodMutation {
       relations: [
         'orderProducts',
         'orderProducts.product',
+        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'shippingOrder',
         'bizplace',
@@ -262,13 +263,14 @@ export class DraftReleaseGoodMutation {
           draftOrder.orderProducts = draftOrder.orderProducts.map(itm => {
             let foundProductInv = productInventory.items.find(
               i =>
-                (i.productId == itm?.product?.id || i.productId == itm?.productBundle?.id) &&
-                i.packingType == itm.packingType &&
-                i.packingSize == itm.packingSize &&
-                i.uom == itm.uom &&
+                (i.productDetailId == itm?.productDetail?.id || i.productId == itm?.productBundle?.id) &&
                 itm.releaseQty <= i.remainQty
             )
-            return { ...itm, releaseUomValue: (foundProductInv.remainUomValue / foundProductInv.remainQty) * itm.releaseQty, status: foundProductInv ? 'suffice' : 'insufficient' }
+            return {
+              ...itm,
+              releaseUomValue: (foundProductInv.remainUomValue / foundProductInv.remainQty) * itm.releaseQty,
+              status: foundProductInv ? 'suffice' : 'insufficient'
+            }
           })
 
           let insufficient = draftOrder.orderProducts.find(op => op.status == 'insufficient')
@@ -277,10 +279,6 @@ export class DraftReleaseGoodMutation {
             let releaseGood = { ...draftOrder }
             delete releaseGood.id
             delete releaseGood.name
-            delete releaseGood.createdAt
-            delete releaseGood.createdBy
-            delete releaseGood.updatedAt
-            delete releaseGood.updatedBy
 
             let orderInventories = []
 
@@ -497,7 +495,6 @@ export async function createDraftReleaseGoodFunction(
     updater: user
   })
 
-
   // // 3. Create draft release good product
   await upsertDraftReleaseGoodProducts(
     domain,
@@ -632,6 +629,7 @@ export async function upsertDraftReleaseGoodProducts(
       relations: [
         'orderProducts',
         'orderProducts.product',
+        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'orderProducts.creator',
         'orderProducts.updater'
@@ -733,8 +731,8 @@ export async function upsertDraftReleaseGoodProducts(
         updatePatch['packingType'] = op?.packingType
           ? op.packingType
           : product?.packingType
-            ? product.packingType
-            : productBundle.packingType
+          ? product.packingType
+          : productBundle.packingType
         updatePatch['uom'] = op?.uom ? op.uom : product?.primaryUnit ? product.primaryUnit : 'UNIT'
         updatePatch['uomValue'] = op?.uomValue ? op.uomValue : product?.primaryValue ? product.primaryValue : 0
 

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

@@ -255,6 +255,7 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
         'releaseGood',
         'orderProducts',
         'orderProducts.product',
+        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'shippingOrder',
         'bizplace',
@@ -316,11 +317,7 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
 
     result.orderProducts = result.orderProducts.map(itm => {
       let foundProductInv = productInventory?.items.find(
-        i =>
-          (i.productId == itm?.product?.id || i.productId == itm?.productBundle?.id) &&
-          i.packingType == itm.packingType &&
-          i.packingSize == itm.packingSize &&
-          i.uom == itm.uom
+        i => i.productDetailId == itm?.productDetail?.id || i.productId == itm?.productBundle?.id
       )
       return {
         ...itm,
@@ -330,6 +327,9 @@ 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/draft-release-good/draft-release-good.ts

@@ -237,6 +237,10 @@ export class DraftReleaseGood {
   @Field({ nullable: true })
   packageId: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  source: string
+
   @ManyToOne(type => ContactPoint)
   @Field(type => ContactPoint, { nullable: true })
   deliverTo: ContactPoint

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

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

@@ -205,32 +205,30 @@ export class OtherQuery {
 
       let packageUomValue = availableItem ? availableItem.remainUomValue / availableItem.remainQty : null
       const newOrderInventory: any = {
-        product: availableItem
-          ? {
-              id: availableItem.productId,
-              sku: availableItem.productSKU,
-              name: availableItem.productName
+        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 : ''
             }
-          : { 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,
+            : 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,
         releaseQty: orderInventory.releaseQty
           ? Number.isInteger(orderInventory.releaseQty)
             ? orderInventory.releaseQty
@@ -354,7 +352,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 }
 
@@ -377,8 +375,8 @@ export class OtherQuery {
               ? productDetail.uomValue
               : null
             : orderProduct?.uomValue
-            ? orderProduct.uomValue
-            : productDetail.uomValue
+              ? orderProduct.uomValue
+              : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,
@@ -484,7 +482,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 }
 
@@ -507,8 +505,8 @@ export class OtherQuery {
               ? productDetail.uomValue
               : null
             : orderProduct?.uomValue
-            ? orderProduct.uomValue
-            : productDetail.uomValue
+              ? orderProduct.uomValue
+              : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,
@@ -528,6 +526,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',