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

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

@@ -195,59 +195,49 @@ export class OtherQuery {
 
       const { items, total } = await InventoryUtil.bizplaceInventoryProductGroup(bizplaces, params, context, tx)
 
-      // Filter to find for item with enough remain qty
-      const availableItems = items.filter(item => item.remainQty >= orderInventory.releaseQty)
-      let availableItem
+      let packageUomValue = total > 0 ? items[0].remainUomValue / items[0].remainQty : null
 
-      if (availableItems.length > 0) {
-        availableItem = availableItems[0]
-      }
-
-      let packageUomValue = availableItem ? availableItem.remainUomValue / availableItem.remainQty : null
       const newOrderInventory: any = {
-        product: availableItem
-          ? {
-              id: availableItem.productId,
-              sku: availableItem.productSKU,
-              name: availableItem.productName
-            }
-          : { 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,
+        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 : ''
+              }
+            : 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
             : null
           : null,
-        releaseUomValue: availableItem
-          ? Number.isInteger(orderInventory.releaseQty)
-            ? parseFloat((orderInventory.releaseQty * packageUomValue).toFixed(2))
-            : null
-          : null,
-        groupType: availableItem ? availableItem.groupType : null,
-        isError: !availableItem ? true : false
+        releaseUomValue:
+          total > 0
+            ? Number.isInteger(orderInventory.releaseQty)
+              ? parseFloat((orderInventory.releaseQty * packageUomValue).toFixed(2))
+              : null
+            : null,
+        groupType: total > 0 ? items[0].groupType : null,
+        isError: total <= 0 ? true : false
       }
 
       newOrderInventories.push(newOrderInventory)
-
-      // end loop
     }
 
     try {
@@ -528,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',