@things-factory/sales-base 4.3.2 → 4.3.5

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

@@ -1,13 +1,12 @@
 import { FileUpload, GraphQLUpload } from 'graphql-upload'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getConnection, getRepository, In, Repository } from 'typeorm'
+import { EntityManager, getConnection, getRepository, In, IsNull, Repository } from 'typeorm'
 
 import { Attachment, createAttachments, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
-import { InventoryUtil } from '../../utils'
-import { Bizplace, ContactPoint, getPermittedBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { Bizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
-import { Product, ProductBundle } from '@things-factory/product-base'
+import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -20,8 +19,12 @@ import {
   ORDER_NUMBER_SETTING_KEY,
   ORDER_STATUS
 } from '../../constants'
-import { OrderNoGenerator } from '../../utils'
+import { ValidationError } from '../../errors'
+import { InventoryUtil, OrderNoGenerator } from '../../utils'
 import { OrderProductPatch } from '../order-product/order-product-types'
+import { ReleaseGood } from '../release-good/release-good'
+import { bulkGenerateReleaseGood, confirmReleaseGood } from '../release-good/release-good-mutation'
+import { bulkReleaseGoodsAvailableItemsFunction } from '../release-good/release-good-query'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
 // import {
@@ -31,10 +34,6 @@ import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
 //   receiveArrivalNoticeFunction
 // } from '../arrival-notice/arrival-notice-mutation'
 import { getDraftReleaseGoodFunction } from './draft-release-good-query'
-import { ReleaseGood } from '../release-good/release-good'
-import { bulkReleaseGoodsAvailableItemsFunction } from '../release-good/release-good-query'
-import { confirmReleaseGood, bulkGenerateReleaseGood } from '../release-good/release-good-mutation'
-import { ValidationError } from '../../errors'
 
 @Resolver(DraftReleaseGood)
 export class DraftReleaseGoodMutation {
@@ -181,7 +180,7 @@ export class DraftReleaseGoodMutation {
   @Mutation(returns => Boolean, { description: 'To generate Release Goods from Draft' })
   async generateReleaseGoodsFromDraft(
     @Ctx() context: any,
-    @Arg('ids', type => [String]) ids: string[],
+    @Arg('ids', type => [String]) ids: string[]
     // @Arg('rawReleaseGoods', type => [NewReleaseGood], { nullable: true }) rawReleaseGoods: NewReleaseGood[],
     // @Arg('bizplaceId', type => String) bizplaceId: string
   ): Promise<boolean> {
@@ -205,7 +204,6 @@ export class DraftReleaseGoodMutation {
       ]
     })
     if (updatableDraftOrders.length > 0) {
-
       let createdReleaseGoods: ReleaseGood[] = []
       const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
 
@@ -217,7 +215,7 @@ export class DraftReleaseGoodMutation {
       })
 
       for (let index = 0; index < updatableDraftOrders.length; index++) {
-        const draftOrder = updatableDraftOrders[index];
+        const draftOrder = updatableDraftOrders[index]
 
         let foundPermittedBizplace: Bizplace
         let companyBizplace: Bizplace
@@ -234,20 +232,41 @@ export class DraftReleaseGoodMutation {
 
         const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
 
-        let productInventory = await InventoryUtil.bizplaceProductInventory(bizplaces, {
-          filters: [{
-            name: 'productId',
-            operator: 'in',
-            value: [
-              ...draftOrder.orderProducts.filter(itm => itm?.product).map(itm => { return itm.product.id }),
-              ...draftOrder.orderProducts.filter(itm => itm?.productBundle).map(itm => { return itm.productBundle.id })
+        let productInventory = await InventoryUtil.bizplaceProductInventory(
+          bizplaces,
+          {
+            filters: [
+              {
+                name: 'productId',
+                operator: 'in',
+                value: [
+                  ...draftOrder.orderProducts
+                    .filter(itm => itm?.product)
+                    .map(itm => {
+                      return itm.product.id
+                    }),
+                  ...draftOrder.orderProducts
+                    .filter(itm => itm?.productBundle)
+                    .map(itm => {
+                      return itm.productBundle.id
+                    })
+                ]
+              }
             ]
-          }]
-        }, context, tx)
-
+          },
+          context,
+          tx
+        )
 
         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 && itm.releaseQty <= i.remainQty)
+          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 &&
+              itm.releaseQty <= i.remainQty
+          )
           return { ...itm, status: foundProductInv ? 'suffice' : 'insufficient' }
         })
 
@@ -266,13 +285,20 @@ export class DraftReleaseGoodMutation {
           let orderInventories = []
 
           for (let index = 0; index < draftOrder.orderProducts.length; index++) {
-            const itm = draftOrder.orderProducts[index];
+            const itm = draftOrder.orderProducts[index]
             let data = []
             if (itm.productBundle) {
-              let bundle = await tx.getRepository(ProductBundle).findOne({ where: { id: itm.productBundle.id }, relations: ['productBundleSettings', 'productBundleSettings.productDetail', 'productBundleSettings.product',] })
+              let bundle = await tx.getRepository(ProductBundle).findOne({
+                where: { id: itm.productBundle.id },
+                relations: [
+                  'productBundleSettings',
+                  'productBundleSettings.productDetail',
+                  'productBundleSettings.product'
+                ]
+              })
 
               for (let index2 = 0; index2 < bundle.productBundleSettings.length; index2++) {
-                const objProductBundleSetting = bundle.productBundleSettings[index2];
+                const objProductBundleSetting = bundle.productBundleSettings[index2]
                 data.push({
                   sku: objProductBundleSetting.product.sku,
                   packing_type: objProductBundleSetting.productDetail.packingType,
@@ -285,24 +311,27 @@ export class DraftReleaseGoodMutation {
                 })
               }
             } else {
-              data = [{
-                sku: itm.product.sku,
-                packing_type: itm.packingType,
-                packing_size: itm.packingSize,
-                uom: itm.uom,
-                release_qty: itm.releaseQty,
-                assignedQty: undefined,
-                assignedUomValue: undefined,
-                releaseUomValue: undefined
-              }]
+              data = [
+                {
+                  sku: itm.product.sku,
+                  packing_type: itm.packingType,
+                  packing_size: itm.packingSize,
+                  uom: itm.uom,
+                  release_qty: itm.releaseQty,
+                  assignedQty: undefined,
+                  assignedUomValue: undefined,
+                  releaseUomValue: undefined
+                }
+              ]
             }
 
             data.forEach(data => {
-              let existingOI = orderInventories.find(itm =>
-                itm.sku == data.sku &&
-                itm.packing_type == data.packing_type &&
-                itm.packing_size == data.packing_size &&
-                itm.uom == data.uom
+              let existingOI = orderInventories.find(
+                itm =>
+                  itm.sku == data.sku &&
+                  itm.packing_type == data.packing_type &&
+                  itm.packing_size == data.packing_size &&
+                  itm.uom == data.uom
               )
 
               if (existingOI) {
@@ -310,11 +339,10 @@ export class DraftReleaseGoodMutation {
               } else {
                 orderInventories.push(data)
               }
-            });
+            })
           }
           try {
             await getConnection().transaction(async (childTx: EntityManager) => {
-
               let availableItems: any[] = await bulkReleaseGoodsAvailableItemsFunction(
                 orderInventories,
                 draftOrder.bizplace.id,
@@ -347,16 +375,17 @@ export class DraftReleaseGoodMutation {
 
               await childTx
                 .getRepository(DraftReleaseGood)
-                .update({ id: draftOrder.id }, { releaseGood: createdReleaseGood, status: DRAFT_RELEASE_ORDER_STATUS.SUBMITTED })
+                .update(
+                  { id: draftOrder.id },
+                  { releaseGood: createdReleaseGood, status: DRAFT_RELEASE_ORDER_STATUS.SUBMITTED }
+                )
 
               createdReleaseGood = await confirmReleaseGood(createdReleaseGood.name, context, childTx)
-
             })
           } catch (error) {
             console.error(error)
           }
         }
-
       }
     }
 
@@ -585,7 +614,13 @@ export async function upsertDraftReleaseGoodProducts(
 
     draftReleaseGood = await draftReleaseGoodRepo.findOne({
       where: { id: draftReleaseGood.id },
-      relations: ['orderProducts', 'orderProducts.product', 'orderProducts.productBundle', 'orderProducts.creator', 'orderProducts.updater']
+      relations: [
+        'orderProducts',
+        'orderProducts.product',
+        'orderProducts.productBundle',
+        'orderProducts.creator',
+        'orderProducts.updater'
+      ]
     })
 
     // Remove all existing order products that do not exist in current input
@@ -648,15 +683,43 @@ export async function upsertDraftReleaseGoodProducts(
             productBundle = existingOP.productBundle
             updatePatch['product'] = existingOP.product || undefined
             updatePatch['productBundle'] = existingOP.productBundle || undefined
+          } else {
+            product = await productRepo.findOne({
+              where: { domain: customerCompanyDomain, sku: op.product.sku, deletedAt: IsNull() },
+              relations: ['productDetails']
+            })
+            if (product) {
+              const productDetails: ProductDetail[] = product.productDetails
+              let selectedProductDetail: ProductDetail[]
+              if (op?.product?.packingType) {
+                selectedProductDetail = productDetails.filter(pd => pd.packingType == op.product.packingType)
+              } else {
+                selectedProductDetail = productDetails.filter(pd => pd.isDefault)
+              }
+
+              product.packingType = selectedProductDetail[0].packingType
+              product.primaryUnit = selectedProductDetail[0].uom
+              product.primaryValue = selectedProductDetail[0].uomValue
+            }
+
+            updatePatch['product'] = product || undefined
+
+            if (!product) {
+              productBundle = await productBundleRepo.findOne({
+                where: { domain: customerCompanyDomain, sku: op.product.sku }
+              })
+              updatePatch['productBundle'] = productBundle || undefined
+            }
+
+            if (!product && !productBundle) throw new Error(`product not found`)
           }
         }
 
-
         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

@@ -282,7 +282,7 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
 
     let productInventory
     if (result.orderProducts.length > 0)
-      productInventory = await InventoryUtil.bizplaceProductInventory(bizplaces, { filters: [{ name: 'productId', operator: 'in', value: [...result.orderProducts.filter(itm => itm?.product).map(itm => { return itm.product.id }), ...result.orderProducts.filter(itm => itm?.productBundle).map(itm => { return itm.productBundle.id })] }] }, context, tx)
+      productInventory = await InventoryUtil.bizplaceProductInventory(bizplaces, { filters: [{ name: 'bizplaceId', operator: 'eq', value: result.bizplace.id }, { name: 'productId', operator: 'in', value: [...result.orderProducts.filter(itm => itm?.product).map(itm => { return itm.product.id }), ...result.orderProducts.filter(itm => itm?.productBundle).map(itm => { return itm.productBundle.id })] }] }, context, tx)
 
     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)

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

@@ -29,7 +29,7 @@ export class OtherQuery {
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
 
-    let bizplaceId: any = params.filters.find(filter => filter.name === 'bizplace_id').value
+    let bizplaceId: any = params.filters.find(filter => filter.name === 'bizplaceId').value
     let foundPermittedBizplace: Bizplace
     let companyBizplace: Bizplace
 

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

@@ -43,6 +43,15 @@ export class InventoryProductGroup {
   @Field(type => Int, { nullable: true })
   packQty: number
 
+  @Field(type => Int, { nullable: true })
+  totalQty: number
+
+  @Field(type => Int, { nullable: true })
+  totalLockedQty: number
+
+  @Field(type => Int, { nullable: true })
+  totalLockedUomValue: number
+
   @Field(type => Int, { nullable: true })
   palletQty: number
 

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

@@ -134,7 +134,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) { }
+      } catch (error) {}
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -797,7 +797,10 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   const companyDomain: Domain = customerBizplace?.company.domain
   const sellercraft: Sellercraft = await tx
     .getRepository(Sellercraft)
-    .findOne({ domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+    .findOne({
+      where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
+      relations: ['domain']
+    })
 
   if (foundReleaseGood.type == 'b2c') {
     if (sellercraft) {

package/server/utils/inventory-util.ts

@@ -52,6 +52,7 @@ export const InventoryUtil = {
 
       const { domain }: { domain: Domain } = context.state
 
+
       const { bizplaceIds, productWhereClause, bundleWhereClause, whereClause, batchBundle, productDetailWhereClause } = await getConditions(
         bizplaces,
         filters,
@@ -60,6 +61,7 @@ export const InventoryUtil = {
       )
 
       let productFilter = filters.find(itm => itm.name == 'productName')
+      let inventoryBizplaceFilter = filters.find(itm => itm.name == 'bizplaceId')
 
       let queryStrings = `
         CREATE TEMP TABLE temp_inventory_product_group ON COMMIT DROP AS (
@@ -111,9 +113,16 @@ export const InventoryUtil = {
               'SINGLE' AS "groupType"
             FROM products p
             INNER join product_details pd on pd.product_id = p.id
-            LEFT JOIN inventories i ON i.product_id = p.id and i.domain_id = $1 and i.status = 'STORED' 
-            INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id AND l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')
-              and i.packing_type = pd.packing_type and i.packing_size = pd.packing_size and i.uom = pd.uom
+            LEFT JOIN (
+              SELECT i.* FROM inventories i 
+              INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id
+              WHERE l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')
+              AND i.domain_id = $1 AND i.status = 'STORED'
+              ${inventoryBizplaceFilter ? `AND i.bizplace_id = '${inventoryBizplaceFilter.value}'` : ``}
+            ) i ON i.product_id = pd.product_id
+            AND i.packing_type = pd.packing_type 
+            and i.packing_size = pd.packing_size 
+            and i.uom = pd.uom 
             LEFT JOIN oi ON i.batch_id = oi.batch_id AND p.name = oi.product_name AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
             LEFT JOIN (
               SELECT pbs.product_id, SUM(pbs.bundle_qty * src.release_qty) AS bundle_product_release_qty, SUM(pbs.bundle_qty * src.release_uom_value) AS bundle_product_release_uom_value 
@@ -122,11 +131,11 @@ export const InventoryUtil = {
               GROUP BY pbs.product_id
             ) bp on i.product_id = bp.product_id
             WHERE p.bizplace_id IN (${bizplaceIds})
-            ${productDetailWhereClause}
-            ${productFilter ? `AND (
-              lower(p.sku) ilike '${productFilter.value}'
-              OR lower(p.name) ilike '${productFilter.value}'
-              OR lower(p.description) ilike '${productFilter.value}'
+              ${productDetailWhereClause}
+              ${productFilter ? `AND (
+                lower(p.sku) ilike '${productFilter.value}'
+                OR lower(p.name) ilike '${productFilter.value}'
+                OR lower(p.description) ilike '${productFilter.value}'
               )
             ` : ``}
             GROUP BY
@@ -146,11 +155,11 @@ export const InventoryUtil = {
               (SUM(COALESCE(i2.qty, 0)) - SUM(COALESCE(i2.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
               (SUM(COALESCE(i2.uom_value, 0)) - SUM(COALESCE(i2.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue"
               FROM product_bundle_settings pbs 
-              LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id AND i2.domain_id = $1
-              INNER JOIN locations l2 ON i2.location_id = l2.id AND i2.domain_id = l2.domain_id AND l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')
-              AND i2.bizplace_id IN (${bizplaceIds})
-              AND i2.status = 'STORED'
+              LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id AND i2.domain_id = $1 AND i2.status = 'STORED'
+              INNER JOIN locations l2 ON i2.location_id = l2.id                
               LEFT JOIN oi ON oi.product_id = i2.product_id
+              WHERE l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')
+              ${inventoryBizplaceFilter ? `AND i2.bizplace_id = '${inventoryBizplaceFilter.value}'` : ``}
               GROUP BY 
                 pbs.product_id, 
                 pbs.product_bundle_id
@@ -382,8 +391,8 @@ export const InventoryUtil = {
             p.id AS "productId",
             SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) AS "remainQty",
             SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) AS "remainUomValue",
-            SUM(COALESCE(i.qty, 0))) AS "totalQty",
-            SUM(COALESCE(i.uom_value, 0))) AS "totalUomValue",
+            SUM(COALESCE(i.qty, 0)) AS "totalQty",
+            SUM(COALESCE(i.uom_value, 0)) AS "totalUomValue",
             SUM(COALESCE(i.locked_qty, 0)) + MAX(COALESCE(oi.release_qty, 0)) AS "totalLockedQty",
             SUM(COALESCE(i.locked_uom_value, 0)) + MAX(COALESCE(oi.release_uom_value, 0)) AS "totalLockedUomValue",
             concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)), ' ', i.uom) AS "remainUomValueWithUom"