@things-factory/warehouse-base 4.3.367 → 4.3.372

package/server/service/inventory-change/inventory-change-mutation.ts

@@ -1,14 +1,42 @@
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In, MoreThan, Not } from 'typeorm'
+import {
+  Arg,
+  Ctx,
+  Directive,
+  Mutation,
+  Resolver
+} from 'type-graphql'
+import {
+  EntityManager,
+  In,
+  MoreThan,
+  Not,
+  SelectQueryBuilder
+} from 'typeorm'
 
-import { Application, ApplicationType, User } from '@things-factory/auth-base'
-import { Bizplace } from '@things-factory/biz-base'
+import {
+  Application,
+  ApplicationType,
+  User
+} from '@things-factory/auth-base'
+import {
+  Bizplace,
+  getCompanyBizplace
+} from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { Account } from '@things-factory/integration-accounting'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { Product, ProductDetail } from '@things-factory/product-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import {
+  Sellercraft,
+  SellercraftStatus
+} from '@things-factory/integration-sellercraft'
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  PartnerSetting,
+  Setting
+} from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 import {
@@ -18,7 +46,12 @@ import {
   LOCATION_STATUS,
   LOCATION_TYPE
 } from '../../constants'
-import { EcommerceController, PosController, SellercraftController, PowrupController } from '../../controllers'
+import {
+  EcommerceController,
+  PosController,
+  PowrupController,
+  SellercraftController
+} from '../../controllers'
 import { InventoryNoGenerator } from '../../utils'
 import { InventoryHistory } from '../inventory-history/inventory-history'
 import { InventoryItemChange } from '../inventory-item-change/inventory-item-change'
@@ -28,7 +61,11 @@ import { Inventory } from '../inventory/inventory'
 import { InventoryPatch } from '../inventory/inventory-types'
 import { Location } from '../location/location'
 import { InventoryChange } from './inventory-change'
-import { InventoryChangeList, InventoryChangePatch, NewInventoryChange } from './inventory-change-types'
+import {
+  InventoryChangeList,
+  InventoryChangePatch,
+  NewInventoryChange
+} from './inventory-change-types'
 
 @Resolver(InventoryChange)
 export class InventoryChangeMutation {
@@ -195,6 +232,13 @@ export class InventoryChangeMutation {
 
       const inventoryChangeRepo = tx.getRepository(InventoryChange)
       const inventoryItemChangeRepo = tx.getRepository(InventoryItemChange)
+
+      let strictProduct = 'false'
+
+      let strictProductSelectionSetting: Setting
+      let partnerStrictProductSelectionSetting: Setting
+
+      // new inventory
       if (_createRecords.length > 0) {
         for (let i = 0; i < _createRecords.length; i++) {
           const newRecord = _createRecords[i]
@@ -214,28 +258,126 @@ export class InventoryChangeMutation {
 
           newRecord.bizplace = bizplace
 
-          var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
-          var productDetail: ProductDetail = await tx.getRepository(ProductDetail).findOne({
-            where: [
-              {
-                product: { id: newRecord.product.id },
-                packingType: newRecord.packingType,
-                packingSize: newRecord.packingSize,
+          //to get product name
+          let customerBizplaceId: string = newRecord.bizplace.id
+          const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
+
+          const qb: SelectQueryBuilder<ProductDetail> = tx
+            .getRepository(ProductDetail)
+            .createQueryBuilder('ProductDetail')
+          qb.innerJoinAndSelect('ProductDetail.product', 'Product')
+          qb.where('Product.deletedAt IS NULL')
+
+          let product: Product
+          let productDetail: ProductDetail
+
+          //define strictProduct in string
+
+          if (!newRecord?.product?.id && newRecord.sku) {
+            strictProductSelectionSetting = await tx.getRepository(Setting).findOne({
+              where: { domain, category: 'id-rule', name: 'strict-product-selection' }
+            })
+
+            if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
+
+            partnerStrictProductSelectionSetting = await tx.getRepository(PartnerSetting).findOne({
+              where: {
+                setting: strictProductSelectionSetting,
+                domain,
+                partnerDomain: companyBizplace?.domain
+              }
+            })
+
+            if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
+          }
+
+          //Condition for interface & if import new only have SKU or SKU and productName in Excel
+
+          if (newRecord?.productDetailId) {
+            qb.andWhere('ProductDetail.id =:productDetailId', { productDetailId: newRecord.productDetailId })
+          } else if (newRecord?.sku) {
+            qb.andWhere('Product.bizplace =:companyBizplaceId', { companyBizplaceId: companyBizplace.id })
+            qb.andWhere('Product.sku =:sku', {
+              sku: newRecord.sku
+            })
+
+            //Condition if the strictProduct=false,
+            // the user will be allowed to create new PackingType/PackingSize/Uom
+
+            if (newRecord?.productDetailName) {
+              qb.andWhere('ProductDetail.name =:productDetailName', {
+                productDetailName: newRecord.productDetailName
+              })
+            }
+
+            if (newRecord.packingType) {
+              qb.andWhere('ProductDetail.packingType =:packingType', {
+                packingType: newRecord.packingType
+              })
+            }
+            if (newRecord.packingSize) {
+              qb.andWhere('ProductDetail.packingSize =:packingSize', {
+                packingSize: newRecord.packingSize
+              })
+            }
+            if (newRecord.uom) {
+              qb.andWhere('ProductDetail.uom =:uom', {
                 uom: newRecord.uom
-              },
-              {
-                product: { id: newRecord.product.id },
-                isDefault: true
+              })
+            }
+
+            productDetail = await qb.getOne()
+
+            if (strictProduct == 'true') {
+              if (newRecord?.packingType && newRecord?.packingType !== productDetail?.packingType) {
+                throw new Error('Packing type does not match with product master')
               }
-            ],
-            order: { isDefault: 'DESC' }
-          })
+              if (newRecord?.packingSize && newRecord?.packingSize !== productDetail?.packingSize) {
+                throw new Error('Packing size does not match with product master')
+              }
+              if (newRecord?.uom && newRecord?.uom !== productDetail?.uom) {
+                throw new Error('Uom value does not match with product master')
+              }
+            }
+          }
+
+          //If could not find productDetail, and only have SKU it will take by default
+          if (!productDetail) {
+            const qb: SelectQueryBuilder<ProductDetail> = tx
+              .getRepository(ProductDetail)
+              .createQueryBuilder('ProductDetail')
+            qb.innerJoinAndSelect('ProductDetail.product', 'Product')
+            qb.where('Product.deletedAt IS NULL')
+
+            if (newRecord?.sku) {
+              qb.andWhere('Product.sku =:sku', {
+                sku: newRecord.sku
+              })
+            } else {
+              qb.andWhere('ProductDetail.isDefault = true')
+            }
+
+            productDetail = await qb.getOne()
 
-          newRecord.product = product
-          newRecord.productDetail = productDetail
-          if (!newRecord.unitCost) {
-            newRecord.unitCost = product.unitCost
+            newRecord.product = productDetail.product
+            newRecord.productDetail = productDetail
+          } else {
+            //if the productDetail is found, and take by default
+            newRecord.product = productDetail.product
+            newRecord.productDetail = productDetail
           }
+
+          //Update field
+          const fields = ['unitCost', 'packingType', 'packingSize', 'uom']
+
+          fields.forEach(field => {
+            if (!newRecord[field] && field == 'unitCost') {
+              newRecord[field] = productDetail.product[field]
+            } else if (!newRecord[field]) {
+              newRecord[field] = productDetail[field]
+            }
+          })
+
           newRecord.status = 'PENDING'
           newRecord.transactionType = 'NEW'
 
@@ -291,7 +433,7 @@ export class InventoryChangeMutation {
           // create new inventory items
           if (newRecord?.inventoryItemChangesJson) {
             const inventoryItemChanges: InventoryItemChange[] = JSON.parse(newRecord.inventoryItemChangesJson)
-            if (product?.isRequireSerialNumberScanningInbound) {
+            if (productDetail?.product?.isRequireSerialNumberScanningInbound) {
               if (inventoryItemChanges?.length != newRecord?.qty) {
                 throw new Error('Serial Numbers not tally with quantity')
               }
@@ -322,6 +464,7 @@ export class InventoryChangeMutation {
         }
       }
 
+      // update inventory
       if (_updateRecords.length > 0) {
         for (let i = 0; i < _updateRecords.length; i++) {
           const updateRecord = _updateRecords[i]
@@ -337,10 +480,18 @@ export class InventoryChangeMutation {
           if (!existingRecord) {
             existingRecord = await tx.getRepository(Inventory).findOne({
               where: { domain, id: updateRecord?.id },
-              relations: ['location', 'warehouse', 'product', 'bizplace', 'bizplace.domain']
+              relations: ['location', 'warehouse', 'product', 'productDetail', 'bizplace', 'bizplace.domain']
             })
           }
 
+          if (updateRecord.palletId && updateRecord.palletId !== existingRecord.palletId) {
+            throw new Error('Updating the Lot ID is not permitted')
+          }
+
+          if (updateRecord.cartonId && updateRecord.cartonId !== existingRecord.cartonId) {
+            throw new Error('Updating the Carton ID is not permitted')
+          }
+
           if (adjustQty >= 0) {
             let existingQty: number = existingRecord.qty - existingRecord.lockedQty
             qtyDiff = existingQty == adjustQty ? existingQty - adjustQty : adjustQty - existingQty
@@ -370,31 +521,98 @@ export class InventoryChangeMutation {
             updateRecord.bizplace = curBizplace
           }
 
+          let customerBizplaceId: string = updateRecord?.bizplace?.id || existingRecord?.bizplace?.id
+          const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId)
+
+          const qb: SelectQueryBuilder<ProductDetail> = tx
+            .getRepository(ProductDetail)
+            .createQueryBuilder('ProductDetail')
+          qb.innerJoinAndSelect('ProductDetail.product', 'Product')
+          qb.where('Product.deletedAt IS NULL')
+
           let product: Product
           let productDetail: ProductDetail
 
-          if (!!updateRecord?.product?.id) {
-            product = await tx.getRepository(Product).findOne(updateRecord.product.id)
-            productDetail = await tx.getRepository(ProductDetail).findOne({
-              where: [
-                {
-                  product: { id: updateRecord.product.id },
-                  packingType: updateRecord?.packingType ? updateRecord.packingType : existingRecord.packingType,
-                  packingSize: updateRecord?.packingSize ? updateRecord.packingSize : existingRecord.packingSize,
-                  uom: updateRecord?.uom ? updateRecord.uom : existingRecord.uom
-                },
-                {
-                  product: { id: updateRecord.product.id },
-                  isDefault: true
-                }
-              ],
-              order: { isDefault: 'DESC' }
+          if (!updateRecord?.productDetail?.id && updateRecord.sku) {
+            strictProductSelectionSetting = await tx.getRepository(Setting).findOne({
+              where: { domain, category: 'id-rule', name: 'strict-product-selection' }
             })
-            updateRecord.product = product
-            updateRecord.productDetail = productDetail
-          } else {
-            product = existingRecord.product
-            productDetail = existingRecord.productDetail
+
+            if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
+
+            partnerStrictProductSelectionSetting = await tx.getRepository(PartnerSetting).findOne({
+              where: {
+                setting: strictProductSelectionSetting,
+                domain,
+                partnerDomain: companyBizplace?.domain
+              }
+            })
+
+            if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
+          }
+
+          let foundProductDetail: ProductDetail
+
+          //Condition for interface & if import update only have SKU or SKU and productName in Excel
+          if (updateRecord?.productDetailId || updateRecord.sku) {
+            if (updateRecord?.productDetailId) {
+              qb.andWhere('ProductDetail.id =:productDetailId', { productDetailId: updateRecord.productDetailId })
+            } else if (updateRecord.sku) {
+              qb.andWhere('Product.bizplace =:companyBizplaceId', { companyBizplaceId: companyBizplace.id })
+              qb.andWhere('Product.sku =:sku', {
+                sku: updateRecord?.sku ? updateRecord.sku : existingRecord.product.sku
+              })
+
+              //Condition if the strictProduct=false, the user will be allowed to update PackingType/PackingSize/Uom
+              //else it will take by default
+
+              if (updateRecord.productDetailName) {
+                qb.andWhere('ProductDetail.name =:productDetailName', {
+                  productDetailName: updateRecord.productDetailName
+                })
+              }
+              if (strictProduct == 'false') {
+                if (updateRecord.packingType) {
+                  qb.andWhere('ProductDetail.packingType =:packingType', {
+                    packingType: updateRecord?.packingType ? updateRecord.packingType : existingRecord.packingType
+                  })
+                }
+                if (updateRecord.packingSize) {
+                  qb.andWhere('ProductDetail.packingSize =:packingSize', {
+                    packingSize: updateRecord?.packingSize ? updateRecord.packingSize : existingRecord.packingSize
+                  })
+                }
+                if (updateRecord.uom) {
+                  qb.andWhere('ProductDetail.uom =:uom', {
+                    uom: updateRecord?.uom ? updateRecord.uom : existingRecord.uom
+                  })
+                }
+              } else {
+                qb.andWhere('ProductDetail.isDefault = true')
+              }
+            }
+
+            foundProductDetail = await qb.getOne()
+
+            //Validation if the strictProduct= true, user are not allowed to update PackingType/PackingSize/Uom
+            //else it will take existing record from product/productDetail
+            if (foundProductDetail) {
+              if (strictProduct === 'true') {
+                if (updateRecord.packingType && updateRecord.packingType !== foundProductDetail.packingType) {
+                  throw new Error('Updating the packing type is not permitted')
+                }
+                if (updateRecord.packingSize && updateRecord.packingSize !== foundProductDetail.packingSize) {
+                  throw new Error('Updating the packing size is not permitted')
+                }
+                if (updateRecord.uom && updateRecord.uom !== foundProductDetail.uom) {
+                  throw new Error('Updating the uom is not permitted')
+                }
+              }
+              updateRecord.productDetail = foundProductDetail
+            } else {
+              product = existingRecord.product
+              productDetail = existingRecord.productDetail
+            }
           }
 
           updateRecord.transactionType == 'MISSING'
@@ -409,16 +627,15 @@ export class InventoryChangeMutation {
               : updateRecord.expirationDate
 
           const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
-            palletId: existingRecord.palletId,
-            cartonId: existingRecord.cartonId,
             ...updateRecord,
             id: undefined,
             name: InventoryNoGenerator.inventoryName(),
             inventory: existingRecord,
+            palletId: existingRecord.palletId,
+            cartonId: existingRecord.cartonId,
             domain: domain,
             creator: user,
             updater: user
-            //here?
           })
 
           const prevBizAccount: Account = await tx
@@ -569,6 +786,7 @@ export class InventoryChangeMutation {
         'inventory.warehouse',
         'bizplace',
         'product',
+        'productDetail',
         'location'
       ]
     })
@@ -1117,6 +1335,8 @@ export async function approveInventoryChanges(patches: any, context: any) {
 
           if (date > releaseBefore) {
             newRecord.obsolete = true
+          } else {
+            newRecord.obsolete = false
           }
         }
 

package/server/service/inventory-history/inventory-history-query.ts

@@ -1255,12 +1255,16 @@ export class InventoryHistoryQuery {
       const offsetInt = parseInt(timezoneOffset) // the offset value from client-side
       const offsetHours = offsetInt < 0 ? Math.abs(offsetInt / 60) : offsetInt / 60
       const localTimestamp = new Date(timestamp.getTime() + offsetHours * 60 * 60 * 1000)
-      const datePart = localTimestamp.toDateString().slice(4)
+      const day = localTimestamp.getDate();
+      const month = localTimestamp.getMonth() + 1;
+      const year = localTimestamp.getFullYear();
       const hours = localTimestamp.getHours().toString().padStart(2, '0')
       const minutes = localTimestamp.getMinutes().toString().padStart(2, '0')
       const seconds = localTimestamp.getSeconds().toString().padStart(2, '0')
+      const datePart = `${day}/${month}/${year}`
       const timePart = `${hours}:${minutes}:${seconds}`
       const dateTime = `${datePart}, ${timePart}`
+    
       return dateTime
     }
 

package/server/service/inventory-history/inventory-history.ts

@@ -1,4 +1,8 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import {
+  Field,
+  ID,
+  ObjectType
+} from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -12,8 +16,14 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain, ScalarDate } from '@things-factory/shell'
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  Domain,
+  ScalarDate
+} from '@things-factory/shell'
 
 import { Inventory } from '../inventory/inventory'
 import { Location } from '../location/location'