@things-factory/warehouse-base 4.3.76 → 4.3.78

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

@@ -137,285 +137,291 @@ export class InventoryChangeMutation {
     @Ctx() context: any
   ) {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    try {
 
-    const _createRecords = []
-    const _updateRecords = []
+      const _createRecords = []
+      const _updateRecords = []
 
-    for (let i = 0; i < patches.length; i++) {
-      let foundExistingPallet = await tx.getRepository(Inventory).findOne({
-        where: { domain, palletId: patches[i]?.palletId }
-      })
+      for (let i = 0; i < patches.length; i++) {
+        let foundExistingPallet = await tx.getRepository(Inventory).createQueryBuilder('iv')
+          .where('iv.domain_id = :domain_id', { domain_id: domain.id })
+          .andWhere('(iv.pallet_id = :pallet_id or iv.id = :id)', { pallet_id: patches[i]?.palletId, id: patches[i]?.id })
+          .getOne()
 
-      if (!foundExistingPallet) {
-        foundExistingPallet = await tx.getRepository(Inventory).findOne({
-          where: { id: patches[i]?.id }
-        })
-      }
+        //remove any unchanged records
+        for (const [key, value] of Object.entries(patches[i])) {
+          if (foundExistingPallet && key != 'id' && key != 'cuFlag' && value == foundExistingPallet[key]) {
+            delete patches[i][key]
+          }
+        }
+
+        // skip process when no processable data found
+        if (Object.keys(patches[i]).filter(x => x != 'id' && x != 'cuFlag').length == 0) {
+          continue
+        }
 
-      const invLockedQty: number = foundExistingPallet?.lockedQty == null ? 0 : foundExistingPallet?.lockedQty
+        const invLockedQty: number = foundExistingPallet?.lockedQty == null ? 0 : foundExistingPallet?.lockedQty
 
-      if (patches[i]?.qty < invLockedQty) {
-        throw new Error(
-          'Adjusted qty value should not be lower than released qty, kindly contact our support if you have difficulties'
-        )
-      }
+        if (patches[i]?.qty < invLockedQty) {
+          throw new Error(
+            'Adjusted qty value should not be lower than released qty, kindly contact our support for assistance'
+          )
+        }
 
-      if (foundExistingPallet) {
-        delete patches[i].serialNumbers
-        _updateRecords.push(patches[i])
-      } else {
-        _createRecords.push(patches[i])
+        if (foundExistingPallet) {
+          delete patches[i].serialNumbers
+          _updateRecords.push(patches[i])
+        } else {
+          _createRecords.push(patches[i])
+        }
       }
-    }
 
-    const inventoryChangeRepo = tx.getRepository(InventoryChange)
-    const inventoryItemChangeRepo = tx.getRepository(InventoryItemChange)
-    if (_createRecords.length > 0) {
-      for (let i = 0; i < _createRecords.length; i++) {
-        const newRecord = _createRecords[i]
+      const inventoryChangeRepo = tx.getRepository(InventoryChange)
+      const inventoryItemChangeRepo = tx.getRepository(InventoryItemChange)
+      if (_createRecords.length > 0) {
+        for (let i = 0; i < _createRecords.length; i++) {
+          const newRecord = _createRecords[i]
 
-        var location = await tx.getRepository(Location).findOne({
-          where: { id: newRecord.location.id },
-          relations: ['warehouse']
-        })
-        newRecord.location = location
-        newRecord.zone = location.zone
-        newRecord.warehouse = location.warehouse
+          var location = await tx.getRepository(Location).findOne({
+            where: { id: newRecord.location.id },
+            relations: ['warehouse']
+          })
+          newRecord.location = location
+          newRecord.zone = location.zone
+          newRecord.warehouse = location.warehouse
 
-        newRecord.bizplace = await tx.getRepository(Bizplace).findOne(newRecord.bizplace.id)
+          newRecord.bizplace = await tx.getRepository(Bizplace).findOne(newRecord.bizplace.id)
 
-        var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
-        newRecord.product = product
+          var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
+          newRecord.product = product
 
-        newRecord.status = 'PENDING'
-        newRecord.transactionType = 'NEW'
+          newRecord.status = 'PENDING'
+          newRecord.transactionType = 'NEW'
 
-        newRecord.expirationDate =
-          ((newRecord?.expirationDate && new Date(newRecord.expirationDate).getFullYear()) || 0) < 2000
-            ? null
-            : newRecord.expirationDate
+          newRecord.expirationDate =
+            ((newRecord?.expirationDate && new Date(newRecord.expirationDate).getFullYear()) || 0) < 2000
+              ? null
+              : newRecord.expirationDate
 
-        const newInventoryChange: InventoryChange = await inventoryChangeRepo.save({
-          ...newRecord,
-          id: undefined,
-          name: InventoryNoGenerator.inventoryName(),
-          domain: domain,
-          creator: user,
-          updater: user
-        })
+          const newInventoryChange: InventoryChange = await inventoryChangeRepo.save({
+            ...newRecord,
+            id: undefined,
+            name: InventoryNoGenerator.inventoryName(),
+            domain: domain,
+            creator: user,
+            updater: user
+          })
 
-        if (newRecord?.serialNumbers) {
-          let serialNumbers: string = newRecord.serialNumbers
-          let newSerialNumbers: any = serialNumbers.split(',')
-          let inventoryItemChanges: InventoryItemChange[] = []
+          if (newRecord?.serialNumbers) {
+            let serialNumbers: string = newRecord.serialNumbers
+            let newSerialNumbers: any = serialNumbers.split(',')
+            let inventoryItemChanges: InventoryItemChange[] = []
 
-          for (let i = 0; i < newSerialNumbers.length; i++) {
-            let newSerialNumber: string = newSerialNumbers[i]
-            let inventoryItemChange: any = {
-              serialNumber: newSerialNumber,
-              type: INVENTORY_ITEM_CHANGE_TYPE.NEW
+            for (let i = 0; i < newSerialNumbers.length; i++) {
+              let newSerialNumber: string = newSerialNumbers[i]
+              let inventoryItemChange: any = {
+                serialNumber: newSerialNumber,
+                type: INVENTORY_ITEM_CHANGE_TYPE.NEW
+              }
+
+              inventoryItemChanges.push(inventoryItemChange)
             }
 
-            inventoryItemChanges.push(inventoryItemChange)
+            newRecord.inventoryItemChangesJson = JSON.stringify(inventoryItemChanges)
           }
 
-          newRecord.inventoryItemChangesJson = JSON.stringify(inventoryItemChanges)
-        }
-
-        // create new inventory items
-        if (newRecord?.inventoryItemChangesJson) {
-          const inventoryItemChanges: InventoryItemChange[] = JSON.parse(newRecord.inventoryItemChangesJson)
-          if (product?.isRequireSerialNumberScanningInbound) {
-            if (inventoryItemChanges?.length != newRecord?.qty) {
-              throw new Error('Serial Numbers not tally with quantity')
+          // create new inventory items
+          if (newRecord?.inventoryItemChangesJson) {
+            const inventoryItemChanges: InventoryItemChange[] = JSON.parse(newRecord.inventoryItemChangesJson)
+            if (product?.isRequireSerialNumberScanningInbound) {
+              if (inventoryItemChanges?.length != newRecord?.qty) {
+                throw new Error('Serial Numbers not tally with quantity')
+              }
             }
-          }
 
-          let newInventoryItemChanges: InventoryItemChange[] = []
-
-          inventoryItemChanges.map(inventoryItemChange => {
-            let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
-            newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
-            newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
-            newInventoryItemChange.type = inventoryItemChange.type
-            newInventoryItemChange.status = newInventoryChange.status
-            newInventoryItemChange.inventoryItem =
-              newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW
-                ? null
-                : newInventoryItemChange.inventoryItem
-            newInventoryItemChange.inventoryChange = newInventoryChange
-            newInventoryItemChange.domain = domain
-            newInventoryItemChange.creator = user
-            newInventoryItemChange.updater = user
-
-            newInventoryItemChanges.push(newInventoryItemChange)
-          })
+            let newInventoryItemChanges: InventoryItemChange[] = []
+
+            inventoryItemChanges.map(inventoryItemChange => {
+              let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
+              newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
+              newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
+              newInventoryItemChange.type = inventoryItemChange.type
+              newInventoryItemChange.status = newInventoryChange.status
+              newInventoryItemChange.inventoryItem =
+                newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW
+                  ? null
+                  : newInventoryItemChange.inventoryItem
+              newInventoryItemChange.inventoryChange = newInventoryChange
+              newInventoryItemChange.domain = domain
+              newInventoryItemChange.creator = user
+              newInventoryItemChange.updater = user
+
+              newInventoryItemChanges.push(newInventoryItemChange)
+            })
 
-          await inventoryItemChangeRepo.save(newInventoryItemChanges)
+            await inventoryItemChangeRepo.save(newInventoryItemChanges)
+          }
         }
       }
-    }
-
-    if (_updateRecords.length > 0) {
-      for (let i = 0; i < _updateRecords.length; i++) {
-        const updateRecord = _updateRecords[i]
 
-        let existingRecord = await tx.getRepository(Inventory).findOne({
-          where: { domain, palletId: updateRecord?.palletId },
-          relations: ['location', 'warehouse', 'product', 'bizplace']
-        })
+      if (_updateRecords.length > 0) {
+        for (let i = 0; i < _updateRecords.length; i++) {
+          const updateRecord = _updateRecords[i]
 
-        if (!existingRecord) {
-          existingRecord = await tx.getRepository(Inventory).findOne({
-            where: { domain, id: updateRecord?.id },
+          let existingRecord = await tx.getRepository(Inventory).findOne({
+            where: { domain, palletId: updateRecord?.palletId },
             relations: ['location', 'warehouse', 'product', 'bizplace']
           })
-        }
 
-        if (!!updateRecord?.location?.id) {
-          var location = await tx.getRepository(Location).findOne({
-            where: { id: updateRecord.location.id },
-            relations: ['warehouse']
-          })
-          updateRecord.location = location
-          updateRecord.zone = location.zone
-          updateRecord.warehouse = location.warehouse
-        }
+          if (!existingRecord) {
+            existingRecord = await tx.getRepository(Inventory).findOne({
+              where: { domain, id: updateRecord?.id },
+              relations: ['location', 'warehouse', 'product', 'bizplace']
+            })
+          }
 
-        if (!!updateRecord?.bizplace?.id)
-          updateRecord.bizplace = await tx.getRepository(Bizplace).findOne(updateRecord.bizplace.id)
+          if (!!updateRecord?.location?.id) {
+            var location = await tx.getRepository(Location).findOne({
+              where: { id: updateRecord.location.id },
+              relations: ['warehouse']
+            })
+            updateRecord.location = location
+            updateRecord.zone = location.zone
+            updateRecord.warehouse = location.warehouse
+          }
 
-        let product: Product
+          if (!!updateRecord?.bizplace?.id)
+            updateRecord.bizplace = await tx.getRepository(Bizplace).findOne(updateRecord.bizplace.id)
 
-        if (!!updateRecord?.product?.id) {
-          product = await tx.getRepository(Product).findOne(updateRecord.product.id)
-          updateRecord.product = product
-        } else {
-          product = existingRecord.product
-        }
+          let product: Product
 
-        updateRecord.transactionType == 'MISSING'
-          ? (updateRecord.transactionType = 'MISSING')
-          : (updateRecord.transactionType = 'CHANGES')
+          if (!!updateRecord?.product?.id) {
+            product = await tx.getRepository(Product).findOne(updateRecord.product.id)
+            updateRecord.product = product
+          } else {
+            product = existingRecord.product
+          }
 
-        updateRecord.status = 'PENDING'
+          updateRecord.transactionType == 'MISSING'
+            ? (updateRecord.transactionType = 'MISSING')
+            : (updateRecord.transactionType = 'CHANGES')
 
-        updateRecord.expirationDate =
-          ((updateRecord?.expirationDate && new Date(updateRecord.expirationDate).getFullYear()) || 0) < 2000
-            ? null
-            : updateRecord.expirationDate
-
-        const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
-          palletId: existingRecord.palletId,
-          ...updateRecord,
-          id: undefined,
-          name: InventoryNoGenerator.inventoryName(),
-          inventory: existingRecord,
-          domain: domain,
-          creator: user,
-          updater: user
-        })
+          updateRecord.status = 'PENDING'
+
+          updateRecord.expirationDate =
+            ((updateRecord?.expirationDate && new Date(updateRecord.expirationDate).getFullYear()) || 0) < 2000
+              ? null
+              : updateRecord.expirationDate
 
-        // create new inventory items
-        if (updateRecord?.inventoryItemChangesJson) {
-          const originalInventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
-            where: { domain, inventory: existingRecord, status: Not('DELETED') }
+          const updatedInventoryChange: InventoryChange = await inventoryChangeRepo.save({
+            palletId: existingRecord.palletId,
+            ...updateRecord,
+            id: undefined,
+            name: InventoryNoGenerator.inventoryName(),
+            inventory: existingRecord,
+            domain: domain,
+            creator: user,
+            updater: user
           })
-          const inventoryItemChanges: InventoryItemChange[] = JSON.parse(updateRecord.inventoryItemChangesJson)
-          if (product?.isRequireSerialNumberScanningInbound) {
-            const combinedInventoryItems: any[] = [...originalInventoryItems, ...inventoryItemChanges]
-            let qty: number = updateRecord?.qty ? updateRecord.qty : existingRecord.qty
 
-            if (originalInventoryItems.length == 0) {
-              if (inventoryItemChanges.length !== qty) {
-                throw new Error('Serial Numbers not tally with quantity')
-              }
-            } else {
-              if (originalInventoryItems?.length - inventoryItemChanges.length !== qty) {
-                throw new Error('Serial Numbers not tally with quantity')
+          // create new inventory items
+          if (updateRecord?.inventoryItemChangesJson) {
+            const originalInventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
+              where: { domain, inventory: existingRecord, status: Not('DELETED') }
+            })
+            const inventoryItemChanges: InventoryItemChange[] = JSON.parse(updateRecord.inventoryItemChangesJson)
+            if (product?.isRequireSerialNumberScanningInbound) {
+              // const combinedInventoryItems: any[] = [...originalInventoryItems, ...inventoryItemChanges]
+              let qty: number = updateRecord?.qty ? updateRecord.qty : existingRecord.qty
+
+              if (originalInventoryItems.length == 0) {
+                if (inventoryItemChanges.length !== qty) {
+                  throw new Error('Serial Numbers not tally with quantity')
+                }
+              } else {
+                if (originalInventoryItems?.length - inventoryItemChanges.length !== qty) {
+                  throw new Error('Serial Numbers not tally with quantity')
+                }
               }
             }
-          }
-
-          let newInventoryItemChanges: InventoryItemChange[] = []
-
-          inventoryItemChanges.map(inventoryItemChange => {
-            let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
-            newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
-            newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
-            newInventoryItemChange.type = inventoryItemChange.type
-            newInventoryItemChange.status = updatedInventoryChange.status
-            newInventoryItemChange.inventory = updatedInventoryChange.inventory
-            newInventoryItemChange.inventoryItem =
-              newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW ? null : inventoryItemChange.inventoryItem
-            newInventoryItemChange.inventoryChange = updatedInventoryChange
-            newInventoryItemChange.domain = domain
-            newInventoryItemChange.creator = user
-            newInventoryItemChange.updater = user
-
-            newInventoryItemChanges.push(newInventoryItemChange)
-          })
 
-          await inventoryItemChangeRepo.save(newInventoryItemChanges)
-        }
-      }
-    }
+            let newInventoryItemChanges: InventoryItemChange[] = []
+
+            inventoryItemChanges.map(inventoryItemChange => {
+              let newInventoryItemChange: InventoryItemChange = new InventoryItemChange()
+              newInventoryItemChange.name = InventoryNoGenerator.inventoryName()
+              newInventoryItemChange.serialNumber = inventoryItemChange.serialNumber
+              newInventoryItemChange.type = inventoryItemChange.type
+              newInventoryItemChange.status = updatedInventoryChange.status
+              newInventoryItemChange.inventory = updatedInventoryChange.inventory
+              newInventoryItemChange.inventoryItem =
+                newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW ? null : inventoryItemChange.inventoryItem
+              newInventoryItemChange.inventoryChange = updatedInventoryChange
+              newInventoryItemChange.domain = domain
+              newInventoryItemChange.creator = user
+              newInventoryItemChange.updater = user
+
+              newInventoryItemChanges.push(newInventoryItemChange)
+            })
 
-    const notificationApprover: any = await tx
-      .getRepository(Privilege)
-      .createQueryBuilder('p')
-      .select('u.*')
-      .addSelect('r.*')
-      .innerJoin('p.roles', 'r')
-      .innerJoin('r.users', 'u')
-      .where('p.name = :name', { name: 'mutation' })
-      .andWhere('p.category = :category', { category: 'inventory' })
-      .andWhere('r.domain_id = :domainId', { domainId: domain.id })
-      .groupBy('u.id')
-      .addGroupBy('r.id')
-      .getRawMany()
-
-    if (_updateRecords.some(res => res.transactionType == 'MISSING')) {
-      if (notificationApprover?.length && context.header?.referer) {
-        const receivers: any[] = notificationApprover.map(user => user.id)
-        const msg = {
-          title: `Missing stock identified. Review this transaction in Inventory Adjustment Approval.`,
-          body: ``,
-          url: context.header.referer,
-          data: { url: context.header.referer }
+            await inventoryItemChangeRepo.save(newInventoryItemChanges)
+          }
         }
-
-        /**
-         * @notes Temporary off sendNotification due to suspect of causing wms down
-         */
-
-        // await sendNotification({
-        //   receivers,
-        //   message: { ...msg }
-        // })
       }
-    } else {
-      if (notificationApprover?.length && context.header?.referer) {
-        const receivers: any[] = notificationApprover.map(user => user.id)
-        const msg = {
-          title: `There is an inventory adjustment pending for approval, kindly review within 1 hour to avoid any operation conflict.`,
-          body: ``,
-          url: context.header.referer,
-          data: { url: context.header.referer }
-        }
-
-        /**
-         * @notes Temporary off sendNotification due to suspect of causing wms down
-         */
 
-        // await sendNotification({
-        //   receivers,
-        //   message: { ...msg }
-        // })
-      }
+      /**
+       * @notes Temporary off sendNotification due to suspect of causing wms down
+       */
+      // const notificationApprover: any = await tx
+      //   .getRepository(Privilege)
+      //   .createQueryBuilder('p')
+      //   .select('u.*')
+      //   .addSelect('r.*')
+      //   .innerJoin('p.roles', 'r')
+      //   .innerJoin('r.users', 'u')
+      //   .where('p.name = :name', { name: 'mutation' })
+      //   .andWhere('p.category = :category', { category: 'inventory' })
+      //   .andWhere('r.domain_id = :domainId', { domainId: domain.id })
+      //   .groupBy('u.id')
+      //   .addGroupBy('r.id')
+      //   .getRawMany()
+
+      // if (_updateRecords.some(res => res.transactionType == 'MISSING')) {
+      //   if (notificationApprover?.length && context.header?.referer) {
+      //     const receivers: any[] = notificationApprover.map(user => user.id)
+      //     const msg = {
+      //       title: `Missing stock identified. Review this transaction in Inventory Adjustment Approval.`,
+      //       body: ``,
+      //       url: context.header.referer,
+      //       data: { url: context.header.referer }
+      //     }
+      //     await sendNotification({
+      //       receivers,
+      //       message: { ...msg }
+      //     })
+      //   }
+      // } else {
+      //   if (notificationApprover?.length && context.header?.referer) {
+      //     const receivers: any[] = notificationApprover.map(user => user.id)
+      //     const msg = {
+      //       title: `There is an inventory adjustment pending for approval, kindly review within 1 hour to avoid any operation conflict.`,
+      //       body: ``,
+      //       url: context.header.referer,
+      //       data: { url: context.header.referer }
+      //     }
+      //     await sendNotification({
+      //       receivers,
+      //       message: { ...msg }
+      //     })
+      //   }
+      // }
+
+      return true
+
+    } catch (error) {
+      throw error
     }
 
-    return true
   }
 
   @Directive('@privilege(category: "inventory_adjustment_approval", privilege: "mutation")')

package/server/service/location/location-query.ts

@@ -31,7 +31,7 @@ export class LocationQuery {
   @Directive('@privilege(category: "warehouse", privilege: "query")')
   @Query(returns => LocationList)
   async pureLocations(@Args() params: ListParam, @Ctx() context: any): Promise<LocationList> {
-    const queryBuilder = getRepository(Location).createQueryBuilder()
+    const queryBuilder = getRepository(Location).createQueryBuilder('location')
     buildQuery(queryBuilder, params, context)
     const items = await queryBuilder.getRawMany()
     const total = await queryBuilder.getCount()

package/server/service/location/location.ts

@@ -105,16 +105,16 @@ export class Location {
 
   constructor(obj?) {
     if (obj) {
-      this.id = obj.Location_id
-      this.name = obj.Location_name
-      this.description = obj.Location_description
-      this.type = obj.Location_type
-      this.zone = obj.Location_zone
-      this.row = obj.Location_row
-      this.column = obj.Location_column
-      this.shelf = obj.Location_shelf
-      this.status = obj.Location_status
-      this.updatedAt = obj.Location_updated_at
+      this.id = obj.location_id
+      this.name = obj.location_name
+      this.description = obj.location_description
+      this.type = obj.location_type
+      this.zone = obj.location_zone
+      this.row = obj.location_row
+      this.column = obj.location_column
+      this.shelf = obj.location_shelf
+      this.status = obj.location_status
+      this.updatedAt = obj.location_updated_at
     }
   }
 }

package/server/service/warehouse/warehouse.ts

@@ -83,13 +83,13 @@ export class Warehouse {
 
   constructor(obj?) {
     if (obj) {
-      this.id = obj.Warehouse_id
-      this.name = obj.Warehouse_name
-      this.locations = obj.Warehouse_locations
-      this.type = obj.Warehouse_type
-      this.description = obj.Warehouse_description
-      this.createdAt = obj.Warehouse_created_at
-      this.updatedAt = obj.Warehouse_updated_at
+      this.id = obj.warehouse_id
+      this.name = obj.warehouse_name
+      this.locations = obj.warehouse_locations
+      this.type = obj.warehouse_type
+      this.description = obj.warehouse_description
+      this.createdAt = obj.warehouse_created_at
+      this.updatedAt = obj.warehouse_updated_at
     }
   }
 }