@things-factory/operato-hub 4.3.382 → 4.3.384

package/server/routers/api/restful-apis/v1/company/upsert-product.ts

@@ -2,16 +2,16 @@ import _ from 'lodash'
 import {
   EntityManager,
   getConnection,
-  getRepository,
   In
 } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { Bizplace } from '@things-factory/biz-base'
 import {
+  createProduct,
+  NewProduct,
   Product,
-  ProductBarcode,
-  ProductDetail
+  ProductPatch,
+  updateProduct
 } from '@things-factory/product-base'
 
 import {
@@ -33,285 +33,82 @@ router.post(
   async (context, next) => {
     try {
       await getConnection().transaction(async (tx: EntityManager) => {
-        if (!Array.isArray(context.request.body.data)) throw new ApiError('E01', 'data field is not an array')
-        let params = { ...context.query }
-        let productInfo = context.request.body.data
-        const skus = productInfo.map(p => p.sku)
-        const { user, domain } = context.state
-        let response = []
-        let newSku = []
-        let existingSku = []
-        let checkSku
-
-        if (!skus) {
-          throw new ApiError('E03', 'sku')
+        const { domain } = context.state
+        if (!Array.isArray(context.request.body.data)) {
+          throw new ApiError('E01', 'data field is not an array')
         }
 
-        let duplicateSku = skus.filter((item, index) => skus.indexOf(item) != index)
+        let patches = context.request.body.data
+        const skus = patches.map(p => p.sku)
 
-        if (duplicateSku?.length > 0) {
-          throw new ApiError('E05', `duplicated products found: ${[...new Set(duplicateSku)]}`)
-        }
+        await Promise.all(
+          patches.map(async p => {
+            if (!p.productDetails || p.productDetails.length === 0) {
+              throw new ApiError('E01', 'missing product detail')
+            }
+          })
+        )
 
-        //get bizplace
-        let bizplace = await getRepository(Bizplace).findOne({
-          where: {
-            domain
-          }
-        })
+        context.state.tx = tx
+        let results = []
 
-        //check Existing sku
-        checkSku = await getRepository(Product).find({
-          where: {
-            sku: In(skus),
-            bizplace
-          },
+        let _foundRecords: Product = await tx.getRepository(Product).find({
+          where: { sku: In(skus), domain },
           relations: ['productDetails', 'productDetails.productBarcodes']
         })
 
-        //separate between existingSku and newSku
-        for (const product of productInfo) {
-          const skuExists = checkSku.some(existingProduct => existingProduct.sku === product.sku)
-
-          if (!(product?.productDetails?.length > 0)) {
-            throw new ApiError('E01', 'missing product detail')
-          }
-
-          if (skuExists) {
-            existingSku.push(product)
-          } else {
-            newSku.push(product)
+        const _updateRecords = patches.filter((patch: any) =>
+          _foundRecords.some(foundRecord => foundRecord.sku === patch.sku)
+        )
+        const _createRecords = patches.filter(
+          (createPatch: any) => !_updateRecords.some(updateRecord => updateRecord.sku === createPatch.sku)
+        )
+
+        if (_createRecords.length > 0) {
+          for (let i = 0; i < _createRecords.length; i++) {
+            const patch: NewProduct = _createRecords[i]
+            const result = await createProduct(patch, context)
+            if (result.costPrice) {
+              result.costPrice = result.costPrice.toFixed(2)
+            }
+            results.push({ ...result })
           }
         }
 
-        if (existingSku.length > 0) {
-          //update product
-          await Promise.all(
-            existingSku.map(async p => {
-              let product = p
-              let matchingSku = checkSku.find(itm => itm.sku == p.sku)
-              const productDetails = p.productDetails
-              product.id = matchingSku.id
-              product.domain = domain
-              product.bizplace = bizplace
-              product.updater = user
-              delete product.productDetails
-
-              let result = await tx.getRepository(Product).save(product)
-
-              let pds = await Promise.all(
-                productDetails.map(async pd => {
-                  let productBarcodes = pd.productBarcodes
-                  delete pd.productBarcodes
-                  if (pd.packingSize < 0) throw new ApiError('E01', `${pd.gtin}: packing size cannot be negative`)
-                  const productDetail = pd
-                  const matchingPd = checkSku.map(itm => {
-                    const matchingProductDetail = itm.productDetails.find(prodDetail => {
-                      return (
-                        prodDetail.packingSize === pd.packingSize &&
-                        prodDetail.packingType === pd.packingType &&
-                        prodDetail.uom === pd.uom
-                      )
-                    })
-
-                    return { matchingProductDetail }
-                  })
-                  let pdResult: ProductDetail
-
-                  const foundIndex = matchingPd.findIndex(itm => itm.matchingProductDetail)
-                  if (foundIndex != -1) {
-                    pdResult = await tx.getRepository(ProductDetail).save({
-                      ...productDetail,
-                      id: matchingPd[foundIndex].matchingProductDetail.id,
-                      name: productDetail.gtin,
-                      product: result,
-                      childProductDetail: null,
-                      childQty: 0,
-                      creatorId: matchingPd[foundIndex].matchingProductDetail.creatorId,
-                      domain: domain,
-                      updater: user
-                    })
-                  } else {
-                    pdResult = await tx.getRepository(ProductDetail).save({
-                      ...productDetail,
-                      name: productDetail.gtin,
-                      product: result,
-                      childProductDetail: null,
-                      childQty: 0,
-                      creator: user,
-                      domain: domain,
-                      updater: user
-                    })
-                  }
-
-                  delete pdResult.creator
-                  delete pdResult.updater
-                  delete pdResult.product
-                  delete pdResult.domain
-
-                  let pbs: ProductBarcode[]
-                  productBarcodes = productBarcodes.filter(barcode => Object.keys(barcode).length > 0)
-
-                  if (productBarcodes.length > 0) {
-                    pbs = await Promise.all(
-                      productBarcodes.map(async pb => {
-                        let existingPb: ProductBarcode
-                        existingPb = await tx.getRepository(ProductBarcode).findOne({
-                          where: {
-                            gtin: pb.gtin,
-                            productDetail: pdResult.id
-                          }
-                        })
-
-                        if (existingPb) {
-                          // Update existing productBarcode
-                          pdResult.productBarcodes = pdResult.productBarcodes || []
-                          pdResult.productBarcodes.push(pb.gtin)
-                          return tx.getRepository(ProductBarcode).update(existingPb.id, {
-                            ...pb,
-                            product: result,
-                            productDetail: pdResult.id,
-                            updater: user
-                          })
-                        } else {
-                          // Create a new productBarcode
-                          pdResult.productBarcodes = pdResult.productBarcodes || []
-                          pdResult.productBarcodes.push(pb.gtin)
-                          return tx.getRepository(ProductBarcode).save({
-                            gtin: pb.gtin ? pb.gtin : result.sku,
-                            product: result,
-                            productDetail: pdResult,
-                            domain,
-                            creator: user,
-                            updater: user
-                          })
-                        }
-                      })
-                    )
-                  } else {
-                    let existingPb: ProductBarcode
-                    existingPb = await tx.getRepository(ProductBarcode).findOne({
-                      where: {
-                        gtin: result.sku,
-                        productDetail: pdResult.id
-                      }
-                    })
-                    if (!existingPb) {
-                      pbs = [
-                        {
-                          gtin: result.sku,
-                          product,
-                          productDetail: pdResult,
-                          domain,
-                          creator: user,
-                          updater: user
-                        }
-                      ]
-
-                      await tx.getRepository(ProductBarcode).save(pbs)
-
-                      pdResult.productBarcodes = pbs.map(pb => pb.gtin)
-                    }
-
-                    if (existingPb) {
-                      pdResult.productBarcodes = [existingPb.gtin]
-                    }
-                  }
-
-                  return pdResult
-                })
-              )
-              delete result.creator
-              delete result.updater
-              delete result.bizplace
-              delete result.domain
-              response.push({ ...result, productDetails: pds })
-            })
-          )
+        if (_updateRecords.length > 0) {
+          for (let i = 0; i < _updateRecords.length; i++) {
+            let patch: ProductPatch = _updateRecords[i]
+            let matchingSku = _foundRecords.find(itm => itm.sku === patch.sku)
+            patch = {
+              ...patch,
+              id: matchingSku.id
+            }
+            const result = await updateProduct(patch.id, patch, context)
+            if (result.costPrice) {
+              result.costPrice = +result.costPrice.toFixed(2)
+            }
+            results.push({ ...result })
+          }
         }
 
-        //add new product
-        if (newSku.length > 0) {
-          await Promise.all(
-            newSku.map(async p => {
-              let product = p
-              const productDetails = p.productDetails
-
-              product.domain = domain
-              product.bizplace = bizplace
-              product.creator = user
-              product.updater = user
-              delete product.productDetails
+        // Set up response body
+        const updatedResults = results.map(product => {
+          const { domain, updater, bizplace, creator, creatorId, updaterId, ...updatedProduct } = product
 
-              let result = await tx.getRepository(Product).save(product)
+          const updatedProductDetails = product.productDetails.map(detail => {
+            const { name, ...restDetail } = detail
+            return restDetail
+          })
 
-              // save product details
-              let pds = await Promise.all(
-                productDetails.map(async pd => {
-                  if (pd.packingSize < 0) throw new ApiError('E01', `${pd.gtin}: packing size cannot be negative`)
-                  const productDetail = pd
-                  const productBarcodes = productDetail.productBarcodes
-                  let pdResult = await tx.getRepository(ProductDetail).save({
-                    ...productDetail,
-                    name: productDetail.gtin,
-                    product: result,
-                    childProductDetail: null,
-                    childQty: 0,
-                    domain: domain,
-                    creator: user,
-                    updater: user
-                  })
-                  delete pdResult.creator
-                  delete pdResult.updater
-                  delete pdResult.product
-                  delete pdResult.domain
-
-                  let pbs: ProductBarcode[]
-
-                  if (productBarcodes) {
-                    pbs = productBarcodes.map(pb => {
-                      return {
-                        ...pb,
-                        gtin: pb.gtin ? pb.gtin : result.sku,
-                        product,
-                        productDetail: pdResult,
-                        domain,
-                        creator: user,
-                        updater: user
-                      }
-                    })
-                    pdResult.productBarcodes = pbs.map(pb => pb.gtin)
-                  } else {
-                    pbs = [
-                      {
-                        gtin: result.sku,
-                        product: result,
-                        productDetail: pdResult,
-                        domain,
-                        creator: user,
-                        updater: user
-                      }
-                    ]
-                    pdResult.productBarcodes = pbs.map(pb => pb.gtin)
-                  }
-
-                  await tx.getRepository(ProductBarcode).save(pbs)
-
-                  return pdResult
-                })
-              )
-              delete result.creator
-              delete result.updater
-              delete result.bizplace
-              delete result.domain
-              response.push({ ...result, productDetails: pds })
-            })
-          )
-        }
+          return {
+            ...updatedProduct,
+            productDetails: updatedProductDetails
+          }
+        })
 
-        //set up response body
+        //pass response
         context.body = {
-          data: response
+          data: updatedResults
         }
       })
     } catch (e) {

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -25,6 +25,7 @@ export const params = {
   'get-delivery-order-list': ['bizplaceId', 'doNo', 'vehicleNo', ...fromToDate, ...limitOffset],
   'get-onhand-inventory-list': ['bizplaceId', 'sku', 'batchId', 'fromDate', 'toDate', ...limitOffset],
   'get-inventory-product-group-list': ['bizplaceId', 'sku', 'batchId', ...fromToDate, ...limitOffset],
+  'get-inventory-adjustment-list': ['bizplaceId', ...fromToDate, ...limitOffset, 'sku', 'adjustmentStatus'],
   'get-manifest-details': ['bizplaceId', 'name', 'id'],
   'add-contact-points': [
     'bizplaceId',
@@ -493,6 +494,7 @@ export const reqParams = {
   'get-inventory-product-group-list': ['bizplaceId'],
   'get-manifest-details': ['bizplaceId'],
   'get-warehouse-bizplace-onhand-inventories': ['bizplaceId'],
+  'get-inventory-adjustment-list': ['bizplaceId', 'fromDate', 'toDate'],
   'upsert-product': [
     {
       name: 'sku',
@@ -885,7 +887,8 @@ export const requireLimitOffsetValidation = [
   'get-marketplace-order-shipping-list',
   'get-contact-point-list',
   'get-bizplace-list',
-  'get-draft-order-list'
+  'get-draft-order-list',
+  'get-inventory-adjustment-list'
 ]
 
 // Require fromDate and toDate
@@ -895,5 +898,6 @@ export const requireFromToDateValidation = [
   'get-goods-received-note-list',
   'get-delivery-order-list',
   'get-marketplace-order-shipping-list',
-  'get-draft-order-list'
+  'get-draft-order-list',
+  'get-inventory-adjustment-list'
 ]

package/server/routers/api/restful-apis/v1/warehouse/get-inventory-adjustment-list.ts

@@ -0,0 +1,234 @@
+import _ from 'lodash'
+import { Between, getRepository, LessThanOrEqual, SelectQueryBuilder } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { InventoryChange } from '@things-factory/warehouse-base'
+
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+
+router.get(
+  '/v1/warehouse/get-inventory-adjustment-list',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      // optional query parameter filter
+      const domainId = context.state.domain.id
+      let filter = { ...context.query }
+      const { bizplaceId, limit, offset } = filter
+      let { fromDate, toDate } = filter
+
+      let page = 0
+      if (offset != 0) {
+        page = offset
+      }
+
+      const fromDateTime = getDateTime(fromDate)
+      const toDateTime = getDateTime(toDate)
+
+      //change dateTime to GMT
+      function getDateTime(newDate) {
+        const DateString = new Date(newDate)
+
+        const timePart = `${DateString.getHours().toString().padStart(2, '0')}:${DateString.getUTCMinutes()
+          .toString()
+          .padStart(2, '0')}:${DateString.getSeconds().toString().padStart(2, '0')}.${DateString.getMilliseconds()
+          .toString()
+          .padStart(3, '0')}`
+
+        const datePart = `${DateString.getFullYear()}-${(DateString.getMonth() + 1)
+          .toString()
+          .padStart(2, '0')}-${DateString.getDate().toString().padStart(2, '0')}`
+
+        const dateTime = `${datePart} ${timePart}`
+
+        return dateTime
+      }
+
+      const qb: SelectQueryBuilder<InventoryChange> = getRepository(InventoryChange).createQueryBuilder('ic')
+
+      qb.leftJoinAndSelect('ic.inventory', 'iv', 'ic.inventory_id = iv.id')
+        .leftJoinAndSelect('ic.product', 'p', 'ic.product_id = p.id')
+        .leftJoinAndSelect('iv.product', 'p2', 'iv.product_id = p2.id')
+        .leftJoinAndSelect('ic.lastInventoryHistory', 'ih', 'ic.last_inventory_history_id = ih.id')
+        .where(`ic.domain_id = :domainId`, { domainId: domainId })
+        .andWhere('ic."created_at" BETWEEN :fromDate AND :toDate', {
+          fromDate: fromDateTime,
+          toDate: toDateTime
+        })
+        .andWhere(`(ic.bizplace_id = :bizplaceId OR (ic.bizplace_id IS NULL AND iv.bizplace_id = :bizplaceId))`, {
+          bizplaceId: bizplaceId
+        })
+
+      if (filter?.sku) {
+        qb.andWhere('p2."sku"=:sku', { sku: filter.sku })
+      }
+
+      if (filter?.adjustmentStatus) {
+        qb.andWhere('ic."status"=:status', { status: filter.adjustmentStatus.toUpperCase() })
+      }
+
+      qb.orderBy('ic.createdAt', 'DESC')
+
+      // Fetch all row for exporting
+      if (page != 0 && limit) {
+        qb.offset((page - 1) * limit).limit(limit)
+      } else {
+        qb.offset(page * limit).limit(limit)
+      }
+
+      let [item, total] = await qb.getManyAndCount()
+
+      let data = []
+      for (const i of item) {
+        let diffQty = 0
+        if (i?.qty && i?.lastInventoryHistory?.qty) {
+          diffQty = (i?.qty ?? 0) - ((i.lastInventoryHistory.openingQty || 0) + i.lastInventoryHistory.qty ?? 0)
+        }
+        const datapoint = {
+          id: i.id,
+          original: {
+            productDetail: {
+              sku:
+                i?.transactionType !== 'NEW'
+                  ? i?.product?.sku
+                    ? i.product.sku
+                    : i?.inventory?.product?.sku
+                    ? i.inventory.product.sku
+                    : null
+                  : null,
+              name:
+                i?.transactionType !== 'NEW'
+                  ? i?.product?.name
+                    ? i.product.name
+                    : i?.inventory?.product?.name
+                    ? i.inventory.product.name
+                    : null
+                  : null
+            },
+            palletId: i?.lastInventoryHistory?.palletId
+              ? i.lastInventoryHistory.palletId
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.palletId
+              ? i.inventory.palletId
+              : null,
+            cartonId: i?.lastInventoryHistory?.cartonId
+              ? i.lastInventoryHistory.cartonId
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.cartonId
+              ? i.inventory.cartonId
+              : null,
+            batchId: i?.lastInventoryHistory?.batchId
+              ? i.lastInventoryHistory.batchId
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.batchId
+              ? i.inventory.batchId
+              : null,
+            batchNoRef: i?.lastInventoryHistory?.batchIdRef
+              ? i.lastInventoryHistory.batchIdRef
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.batchIdRef
+              ? i.inventory.batchIdRef
+              : null,
+            packingType: i?.lastInventoryHistory?.packingType
+              ? i.lastInventoryHistory.packingType
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.packingType
+              ? i.inventory.packingType
+              : null,
+            packingSize: i?.lastInventoryHistory?.packingSize
+              ? i.lastInventoryHistory.packingSize
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.packingSize
+              ? i.inventory.packingSize
+              : null,
+            qty: i?.lastInventoryHistory?.qty
+              ? (i.lastInventoryHistory.openingQty || 0) + i.lastInventoryHistory.qty
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.qty
+              ? i.inventory.qty
+              : null,
+            uom: i?.lastInventoryHistory?.uom
+              ? i.lastInventoryHistory.uom
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.uom
+              ? i.inventory.uom
+              : null,
+            uomValue: i?.lastInventoryHistory?.openingUomValue
+              ? (i.lastInventoryHistory.openingUomValue || 0) + i.lastInventoryHistory.uomValue
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.uomValue
+              ? i.inventory.uomValue
+              : null,
+            unitCost: i?.lastInventoryHistory?.unitCost
+              ? i.lastInventoryHistory.unitCost
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.unitCost
+              ? i.inventory.unitCost
+              : null,
+            expirationDate: i?.lastInventoryHistory?.expirationDate
+              ? i.lastInventoryHistory.expirationDate
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.expirationDate
+              ? i.inventory.expirationDate
+              : null,
+            manufactureDate: i?.lastInventoryHistory?.manufactureDate
+              ? i.lastInventoryHistory.manufactureDate
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.manufactureDate
+              ? i.inventory.manufactureDate
+              : null,
+            adjustmentCode: i?.lastInventoryHistory?.adjustmentCode
+              ? i.lastInventoryHistory.adjustmentCode
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') &&
+                i?.status === 'PENDING' &&
+                i?.inventory?.adjustmentCode
+              ? i.inventory.adjustmentCode
+              : null,
+            adjustmentNote: i?.lastInventoryHistory?.adjustmentNote
+              ? i.lastInventoryHistory.adjustmentNote
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') &&
+                i?.status === 'PENDING' &&
+                i?.inventory?.adjustmentNote
+              ? i.inventory.adjustmentNote
+              : null,
+            inventoryStatus: i?.lastInventoryHistory?.status
+              ? i.lastInventoryHistory.status
+              : (i?.transactionType === 'CHANGES' || i?.transactionType === 'MISSING') && i?.inventory?.status
+              ? i.inventory.status
+              : null
+          },
+          new: {
+            productDetail: {
+              sku: i?.product?.sku ? i.product.sku : null,
+              name: i?.product?.name ? i.product.name : null
+            },
+            palletId: i?.palletId ? i.palletId : null,
+            cartonId: i?.cartonId ? i.cartonId : null,
+            batchId: i?.batchId ? i.batchId : null,
+            batchNoRef: i?.batchIdRef ? i.batchIdRef : null,
+            packingType: i?.packingType ? i.packingType : null,
+            packingSize: i?.packingSize ? i.packingSize : null,
+            qty: i?.qty ? i.qty : null,
+            uom: i?.uom ? i.uom : null,
+            uomValue: i?.uomValue ? i.uomValue : null,
+            unitCost: i?.unitCost ? i.unitCost : null,
+            expirationDate: i?.expirationDate ? i.expirationDate : null,
+            manufactureDate: i?.manufactureDate ? i.manufactureDate : null,
+            adjustmentCode: i?.adjustmentCode ? i.adjustmentCode : null,
+            adjustmentNote: i?.adjustmentNote ? i.adjustmentNote : null,
+            inventoryStatus: i?.status !== 'PENDING' && i?.inventory?.status === 'MISSING' ? i.inventory.status : null,
+            adjustmentStatus: i?.status ? i.status : null,
+            type: i?.transactionType ? i.transactionType : null,
+            submittedAt: i?.createdAt ? i.createdAt : null,
+            updatedAt: i?.updatedAt ? i.updatedAt : null
+          },
+          adjusted: {
+            qty: diffQty === 0 ? 0 : diffQty < 0 ? diffQty : `+${diffQty}`
+          }
+        }
+        data.push(datapoint)
+      }
+
+      context.body = {
+        data,
+        limit,
+        offset,
+        total
+      }
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)

package/server/routers/api/restful-apis/v1/warehouse/index.ts

@@ -18,4 +18,5 @@ import './get-do-document'
 import './dispatch-delivery-order'
 import './update-gan-to-arrived'
 import './complete-delivery-order'
+import './get-inventory-adjustment-list'
 import './get-manifest-details'