@things-factory/operato-pms 4.3.595 → 4.3.601

package/dist-server/utils/transaction-util.js

@@ -38,7 +38,7 @@ async function updateTransactionHistory(block, domain, ramp, refActionID, refRec
             });
             if (!existingTransactionRecord)
                 throw new Error('Oops! Could not find current harvest record');
-            await transactionRepo.update({ id: existingTransactionRecord.id }, { fieldBunches: totalBunches, updater: user, updatedAt: new Date() });
+            await transactionRepo.update({ id: existingTransactionRecord.id }, { fieldBunches: totalBunches, transactionDate, block, updater: user, updatedAt: new Date() });
     }
     return true;
 }
@@ -48,64 +48,43 @@ exports.updateTransactionHistory = updateTransactionHistory;
  * seq will be calculated based on number of records for one specific plantation inventory
  */
 async function generateRampBlockHistories(block, domain, ramp, transactionType, transactionDate, rampWeight, user, deletedAt, dailyDispatch, trxMgr) {
-    console.log(block, domain, ramp, user);
     const rampBlockHistoryRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(entities_1.RampBlockHistory)) || (0, typeorm_1.getRepository)(entities_1.RampBlockHistory);
     if (!(ramp === null || ramp === void 0 ? void 0 : ramp.id))
         throw new Error(`Can't find a matching ramp.`);
+    // Fetch the last ramp block history for the given block, ramp, and domain
     const lastRampBlockHistory = await rampBlockHistoryRepo.findOne({
         where: { domain, ramp, block },
-        order: { seq: 'DESC' }
+        order: { createdAt: 'DESC' }
     });
-    let res;
-    if (!lastRampBlockHistory) {
-        res = await rampBlockHistoryRepo
-            .createQueryBuilder()
-            .insert()
-            .into(entities_1.RampBlockHistory)
-            .values([
-            {
-                transactionDate,
-                transactionType,
-                seq: 0,
-                domain,
-                block,
-                ramp,
-                weight: rampWeight,
-                previousWeight: 0,
-                currentWeight: rampWeight,
-                dailyDispatch,
-                deletedAt: deletedAt ? deletedAt : null,
-                creator: user,
-                updater: user
-            }
-        ])
-            .returning('*')
-            .execute();
-    }
-    else {
-        const previousWeight = lastRampBlockHistory.currentWeight;
-        res = await rampBlockHistoryRepo
-            .createQueryBuilder()
-            .insert()
-            .into(entities_1.RampBlockHistory)
-            .values([
-            {
-                domain,
-                block,
-                ramp,
-                transactionType,
-                transactionDate,
-                weight: rampWeight,
-                previousWeight,
-                currentWeight: parseFloat((previousWeight + rampWeight).toFixed(4)),
-                creator: user,
-                updater: user,
-                seq: () => `(select seq from ramp_block_histories where ramp_id = '${ramp.id}' and block_id = '${block.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1`
-            }
-        ])
-            .returning('*')
-            .execute();
-    }
+    // if (!lastRampBlockHistory) {
+    //   throw new Error(
+    //     `No opening quantity defined for block ${block.id} in ramp ${ramp.id}. Please set an opening quantity before creating dispatch records to avoid negative calculation in report.`
+    //   )
+    // }
+    const previousWeight = lastRampBlockHistory.currentWeight;
+    const res = await rampBlockHistoryRepo
+        .createQueryBuilder()
+        .insert()
+        .into(entities_1.RampBlockHistory)
+        .values([
+        {
+            domain,
+            block,
+            ramp,
+            transactionType,
+            transactionDate,
+            weight: rampWeight,
+            previousWeight,
+            currentWeight: parseFloat((previousWeight + rampWeight).toFixed(4)),
+            dailyDispatch,
+            creator: user,
+            updater: user,
+            seq: () => `(select seq from ramp_block_histories where ramp_id = '${ramp.id}' and block_id = '${block.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1`
+        }
+    ])
+        .returning('*')
+        .execute();
+    // Extract the newly created ramp block history
     let newRampBlockHistory = res.generatedMaps[0];
     return newRampBlockHistory;
 }

package/dist-server/utils/transaction-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-pms",
-  "version": "4.3.595",
+  "version": "4.3.601",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -95,5 +95,5 @@
   "devDependencies": {
     "@things-factory/builder": "^4.3.591"
   },
-  "gitHead": "5f3c80271b0e59c82c416f6444a90f57dc8edd6f"
+  "gitHead": "d7949f19d5fb44db88037b9e4a4167d49121954d"
 }

package/server/entities/daily-dispatch.ts

@@ -55,8 +55,8 @@ export class DailyDispatch {
   @ManyToOne(type => Organization, { nullable: true })
   dispatchTo: Organization
 
-  @Column({ nullable: true })
-  dispatchAt: Date
+  @Column({ type: 'timestamp', nullable: true })
+  dispatchAt: Date | string
 
   @Column({ nullable: true })
   dispatchDate: string

package/server/entities/ramp-block-history.ts

@@ -4,11 +4,7 @@ import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedCol
 import { Block, Ramp, PlantationInventory, DailyDispatch } from '../entities'
 
 @Entity()
-@Index(
-  'ix_ramp_block_history_0',
-  (rampBlockHistory: RampBlockHistory) => [rampBlockHistory.id],
-  { unique: true }
-)
+@Index('ix_ramp_block_history_0', (rampBlockHistory: RampBlockHistory) => [rampBlockHistory.id], { unique: true })
 export class RampBlockHistory {
   @PrimaryGeneratedColumn('uuid')
   id: string
@@ -41,6 +37,7 @@ export class RampBlockHistory {
    * transactionType
    * LOADING
    * DISPATCH
+   * REVERSE_DISPATCH
    */
   @Column()
   transactionType: string

package/server/graphql/resolvers/daily-dispatch/delete-daily-dispatch.ts

@@ -1,14 +1,18 @@
 import { Domain } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
 import { EntityManager, IsNull } from 'typeorm'
-import { DailyDispatch, DailyDispatchDetail } from '../../../entities'
+import { DailyDispatch, DailyDispatchDetail, RecordTransaction, RampBlockHistory } from '../../../entities'
 
 export const deleteDailyDispatch = {
   async deleteDailyDispatch(_: any, { name }, context: any) {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    const { user, domain, tx }: { user: User; domain: Domain; tx: EntityManager } = context.state
+
+    // Step 1: Fetch the daily dispatch record
     const dailyDispatch = await tx
       .getRepository(DailyDispatch)
       .findOneOrFail({ where: { name, deletedAt: IsNull() }, relations: ['dailyDispatchDetails'] })
 
+    // Step 2: Soft delete the daily dispatch record
     await tx.getRepository(DailyDispatch).update(
       {
         domain,
@@ -19,6 +23,7 @@ export const deleteDailyDispatch = {
       }
     )
 
+    // Step 3: Soft delete related daily dispatch details
     await tx.getRepository(DailyDispatchDetail).update(
       {
         domain,
@@ -28,5 +33,67 @@ export const deleteDailyDispatch = {
         deletedAt: new Date()
       }
     )
+
+    // Step 4: Soft delete related record transactions
+    await tx.getRepository(RecordTransaction).update(
+      {
+        domain,
+        refActionID: dailyDispatch.id
+      },
+      {
+        deletedAt: new Date()
+      }
+    )
+
+    // Step 5: Reverse the effects of the dispatch in ramp_block_histories
+    await reverseRampBlockHistories(domain, user, dailyDispatch, tx)
+  }
+}
+
+// Helper function to reverse ramp block histories
+async function reverseRampBlockHistories(
+  domain: Domain,
+  user: User,
+  dailyDispatch: DailyDispatch,
+  tx?: EntityManager
+): Promise<void> {
+  const rampBlockHistoryRepo = tx.getRepository(RampBlockHistory)
+
+  // Fetch all ramp block histories related to this dispatch
+  const rampBlockHistories = await rampBlockHistoryRepo.find({
+    where: {
+      domain,
+      dailyDispatch: dailyDispatch.id,
+      transactionType: 'DISPATCH'
+    },
+    relations: ['ramp', 'block', 'domain']
+  })
+
+  // Reverse the effects of each ramp block history record
+  for (const history of rampBlockHistories) {
+    // Create a new ramp block history record to reverse the dispatch
+    await rampBlockHistoryRepo.save({
+      weight: -history.weight, // Reverse the weight (e.g., if dispatch was -100, reversal will be +100)
+      previousWeight: history.previousWeight,
+      currentWeight: parseFloat((history.previousWeight + -history.weight).toFixed(4)),
+      transactionType: 'REVERSE_DISPATCH', // Use a new transaction type for reversals
+      transactionDate: dailyDispatch.dispatchDate, // Use the current date for the reversal
+      domain: history.domain,
+      block: history.block,
+      ramp: history.ramp,
+      dailyDispatch,
+      creator: user,
+      updater: user
+    })
+
+    // Soft delete the original ramp block history record
+    await rampBlockHistoryRepo.update(
+      {
+        id: history.id
+      },
+      {
+        deletedAt: new Date()
+      }
+    )
   }
 }

package/server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts

@@ -1,8 +1,6 @@
-import { EntityManager, getRepository, Repository } from 'typeorm'
-
+import { EntityManager, Repository } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-
 import { RECORD_STATUS, TRANSACTION_TYPE } from '../../../constants'
 import {
   Block,
@@ -11,6 +9,7 @@ import {
   Organization,
   OrganizationStaff,
   Ramp,
+  RampBlockHistory,
   Truck
 } from '../../../entities'
 import { generateRampBlockHistories, generateTransactionHistory, NoGenerator } from '../../../utils'
@@ -19,117 +18,174 @@ export const generateDailyDispatch = {
   async generateDailyDispatch(_: any, { dailyDispatch }, context: any) {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
 
-    let dailyDispatchDetails: DailyDispatchDetail[] = dailyDispatch.dailyDispatchDetails
-    let driver: OrganizationStaff
-    let transport: Truck
-    let dispatchTo: Organization
+    try {
+      const { dailyDispatchDetails, driver, transport, dispatchTo, dispatchAt, chitNo, percentage } = dailyDispatch
 
-    if (dailyDispatch?.driver) {
-      driver = await tx.getRepository(OrganizationStaff).findOne({
-        where: { id: dailyDispatch.driver.id }
-      })
-    }
+      // Validate input data
+      if (!dailyDispatchDetails || dailyDispatchDetails.length === 0) {
+        throw new Error('Daily dispatch details are required.')
+      }
 
-    if (dailyDispatch?.transport) {
-      transport = await tx.getRepository(Truck).findOne({
-        where: { id: dailyDispatch.transport.id }
-      })
-    }
+      // Fetch related entities
+      const driverEntity = driver ? await fetchEntity(tx.getRepository(OrganizationStaff), driver.id) : null
+      const transportEntity = transport ? await fetchEntity(tx.getRepository(Truck), transport.id) : null
+      const dispatchToEntity = dispatchTo ? await fetchEntity(tx.getRepository(Organization), dispatchTo.id) : null
 
-    if (dailyDispatch?.dispatchTo) {
-      dispatchTo = await tx.getRepository(Organization).findOne({
-        where: { id: dailyDispatch.dispatchTo.id }
+      // Calculate total tonnage released
+      const totalTonnageRelease = dailyDispatchDetails.reduce((sum, detail) => sum + detail.collectedRampWeight, 0)
+
+      // Create daily dispatch record
+      const newDailyDispatch = await createDailyDispatch({
+        domain,
+        transport: transportEntity,
+        driver: driverEntity,
+        dispatchTo: dispatchToEntity,
+        totalTonnageRelease,
+        chitNo,
+        percentage,
+        dispatchAt,
+        user,
+        tx
       })
-    }
 
-    const totalTonnageRelease: number = dailyDispatchDetails.reduce(function (prev, cur) {
-      return prev + cur.collectedRampWeight
-    }, 0)
-
-    // 1. Create daily dispatchment
-    let newDailyDispatch: DailyDispatch = new DailyDispatch()
-    newDailyDispatch.name = NoGenerator.dailyDispatch()
-    newDailyDispatch.domain = domain
-    newDailyDispatch.transport = transport
-    newDailyDispatch.transportNo = transport.name
-    newDailyDispatch.driver = driver
-    newDailyDispatch.driverIdentification = driver?.idNumber ? driver.idNumber : null
-    newDailyDispatch.externalDriver = driver?.name ? driver?.name : null
-    newDailyDispatch.totalTonnageRelease = totalTonnageRelease
-    newDailyDispatch.chitNo = dailyDispatch?.chitNo
-    newDailyDispatch.percentage = dailyDispatch?.percentage
-    newDailyDispatch.dispatchTo = dispatchTo
-    newDailyDispatch.dispatchDate = dailyDispatch.dispatchAt.split('T')[0]
-    newDailyDispatch.dispatchAt = dailyDispatch.dispatchAt
-    newDailyDispatch.status = RECORD_STATUS.STORED
-    newDailyDispatch.creator = user
-    newDailyDispatch = await tx.getRepository(DailyDispatch).save(newDailyDispatch)
-
-    // 2. Create daily dispatch detail
-    dailyDispatchDetails = await addDailyDispatchDetail(
-      domain,
-      newDailyDispatch,
-      dailyDispatchDetails.map((record: DailyDispatchDetail) => {
-        return { ...record }
-      }),
-      user,
-      tx
-    )
+      // Create daily dispatch details
+      const createdDetails = await addDailyDispatchDetail(domain, newDailyDispatch, dailyDispatchDetails, user, tx)
 
-    await generateDispatchTransaction(domain, newDailyDispatch, dailyDispatchDetails, user, tx)
+      // Generate transaction history and ramp block histories
+      await generateDispatchTransaction(domain, newDailyDispatch, createdDetails, user, tx)
+
+      return newDailyDispatch
+    } catch (error) {
+      console.error('Error generating daily dispatch:', error)
+      throw new Error('Failed to generate daily dispatch.')
+    }
+  }
+}
 
-    return newDailyDispatch
+// Helper function to fetch an entity by ID
+async function fetchEntity<T>(repository: Repository<T>, id: string): Promise<T> {
+  const entity = await repository.findOne({ where: { id } })
+  if (!entity) {
+    throw new Error(`Entity with ID ${id} not found.`)
   }
+  return entity
 }
 
-export async function addDailyDispatchDetail(
+// Helper function to create a daily dispatch record
+async function createDailyDispatch({
+  domain,
+  transport,
+  driver,
+  dispatchTo,
+  totalTonnageRelease,
+  chitNo,
+  percentage,
+  dispatchAt,
+  user,
+  tx
+}: {
+  domain: Domain
+  transport: Truck | null
+  driver: OrganizationStaff | null
+  dispatchTo: Organization | null
+  totalTonnageRelease: number
+  chitNo?: string
+  percentage?: number
+  dispatchAt: Date | string // Allow both Date and string
+  user: User
+  tx: EntityManager
+}): Promise<DailyDispatch> {
+  const dailyDispatchRepo = tx.getRepository(DailyDispatch)
+
+  // Convert dispatchAt to a string if it's a Date object
+  const dispatchDate =
+    typeof dispatchAt === 'string' ? dispatchAt.split('T')[0] : dispatchAt.toISOString().split('T')[0]
+
+  const newDailyDispatch = dailyDispatchRepo.create({
+    name: NoGenerator.dailyDispatch(),
+    domain,
+    transport,
+    transportNo: transport?.name || null,
+    driver,
+    driverIdentification: driver?.idNumber || null,
+    externalDriver: driver?.name || null,
+    totalTonnageRelease,
+    chitNo,
+    percentage,
+    dispatchTo,
+    dispatchDate, // Use the formatted date string
+    dispatchAt: typeof dispatchAt === 'string' ? dispatchAt : dispatchAt.toISOString(), // Ensure dispatchAt is a string
+    status: RECORD_STATUS.STORED,
+    creator: user
+  })
+
+  return await dailyDispatchRepo.save(newDailyDispatch)
+}
+
+// Helper function to add daily dispatch details
+async function addDailyDispatchDetail(
   domain: Domain,
-  newDailyDispatch: DailyDispatch,
-  dailyDispatchDetails: DailyDispatchDetail[],
+  dailyDispatch: DailyDispatch,
+  details: DailyDispatchDetail[],
   user: User,
-  tx?: EntityManager
+  tx: EntityManager
 ): Promise<DailyDispatchDetail[]> {
-  const rampRepo: Repository<Ramp> = tx?.getRepository(Ramp) || getRepository(Ramp)
-  const dailyDispatchDetailRepo: Repository<DailyDispatchDetail> =
-    tx?.getRepository(DailyDispatchDetail) || getRepository(DailyDispatchDetail)
-
-  dailyDispatchDetails = await Promise.all(
-    dailyDispatchDetails.map(async (dailyDispatchDetail: DailyDispatchDetail) => {
-      return {
-        ...dailyDispatchDetail,
+  const rampRepo = tx.getRepository(Ramp)
+  const detailRepo = tx.getRepository(DailyDispatchDetail)
+
+  // Extract unique ramp IDs from details
+  // const uniqueRampIds = new Set(details.map(detail => detail.ramp.id))
+
+  // Validate opening quantities for all unique ramps
+  // for (const rampId of uniqueRampIds) {
+  //   const ramp = await fetchEntity(rampRepo, rampId)
+  //   await validateOpeningQuantities(domain, ramp, tx)
+  // }
+
+  // Create and save daily dispatch details
+  const createdDetails = await Promise.all(
+    details.map(async detail => {
+      const ramp = await fetchEntity(rampRepo, detail.ramp.id)
+
+      return detailRepo.create({
+        ...detail,
         domain,
         name: NoGenerator.dailyDispatchDetail(),
-        ramp: await rampRepo.findOne({ id: dailyDispatchDetail.ramp.id }),
-        dailyDispatch: newDailyDispatch,
+        ramp,
+        dailyDispatch,
         creator: user,
         updater: user
-      }
+      })
     })
   )
 
-  return await dailyDispatchDetailRepo.save(dailyDispatchDetails)
+  return await detailRepo.save(createdDetails)
 }
 
-export async function generateDispatchTransaction(
+async function generateDispatchTransaction(
   domain: Domain,
-  newDailyDispatch: DailyDispatch,
-  dailyDispatchDetails: DailyDispatchDetail[],
+  dailyDispatch: DailyDispatch, // Ensure this is passed correctly
+  details: DailyDispatchDetail[],
   user: User,
-  tx?: EntityManager
+  tx: EntityManager
 ): Promise<void> {
-  const blockRepo: Repository<Block> = tx?.getRepository(Block) || getRepository(Block)
+  const blockRepo = tx.getRepository(Block)
 
-  for (let dailyDispatch of dailyDispatchDetails) {
-    const dispatchedTonnage: number = dailyDispatch.collectedRampWeight
-    const dispatchDate: string = newDailyDispatch.dispatchAt.toString().split('T')[0]
-    const ramp: Ramp = dailyDispatch.ramp
+  for (const detail of details) {
+    const dispatchedTonnage = detail.collectedRampWeight
+    const dispatchDate =
+      typeof dailyDispatch.dispatchAt === 'string'
+        ? dailyDispatch.dispatchAt.split('T')[0]
+        : dailyDispatch.dispatchAt.toISOString().split('T')[0]
+    const ramp = detail.ramp
 
+    // Generate transaction history
     await generateTransactionHistory(
       null,
       domain,
-      dailyDispatch.ramp,
-      newDailyDispatch.id,
-      newDailyDispatch.name,
+      ramp,
+      dailyDispatch.id,
+      dailyDispatch.name,
       TRANSACTION_TYPE.DISPATCHMENT,
       dispatchDate,
       0,
@@ -138,56 +194,30 @@ export async function generateDispatchTransaction(
       tx
     )
 
-    let rampBlockHistory = await tx.query(
+    // Fetch the latest ramp block histories
+    const rampBlockHistories = await tx.query(
       `
-        SELECT * FROM (
-          SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date desc, transaction_type) AS rn FROM ramp_block_histories 
-          WHERE ramp_id =$1 AND transaction_date <= $2
-        ) foo WHERE rn = 1
+      SELECT * FROM (
+        SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date DESC, transaction_type) AS rn
+        FROM ramp_block_histories
+        WHERE ramp_id = $1 AND transaction_date <= $2
+      ) foo WHERE rn = 1
       `,
       [ramp.id, dispatchDate]
     )
 
-    let totalRampWeight: number = rampBlockHistory.reduce((total, currentValue) => {
-      total += currentValue.previous_weight + currentValue.weight
-      return total
-    }, 0)
-
-    for (let index = 0; index < rampBlockHistory.length; index++) {
-      const dt2 = rampBlockHistory[index]
-      const block: Block = await blockRepo.findOne({ id: dt2.block_id })
-
-      let currentRampBlockWeight = dt2.previous_weight + dt2.weight
-      let percentage = parseFloat((currentRampBlockWeight / totalRampWeight).toFixed(4))
-      let weight = (-dispatchedTonnage * percentage).toFixed(4)
-
-      //   // insert into ramp_block_histories (id,transaction_type, creator_id, updater_id, transaction_date, created_at, updated_at, weight, domain_id, block_id, ramp_id)
-      //   let processedData = await tx.query(
-      //     `
-      //     insert into ramp_block_histories (id, seq, transaction_type, creator_id, updater_id, transaction_date, created_at, updated_at, domain_id, ramp_id, weight, previous_weight, current_weight, block_id, daily_dispatch_id)
-      //     SELECT uuid_generate_v4() AS id, (select seq from ramp_block_histories where ramp_id = '${ramp.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1,'DISPATCH' AS transaction_type,
-      //     '0933baea-e099-494b-9791-3dfe805731f0' AS creator_id, '0933baea-e099-494b-9791-3dfe805731f0' AS updater_id,
-      //     $1 AS transaction_date, $2 AS created_at, $3 AS updated_at,
-      //     $4 AS domain_id, $5 AS ramp_id,
-      //     $6 AS weight,
-      //     $7 AS previous_weight,
-      //     $8 AS current_weight,
-      //     $9 AS block_id,
-      //     $10 AS daily_dispatch_id
-      // `,
-      //     [
-      //       dispatchDate,
-      //       dt2.created_at,
-      //       dt2.updated_at,
-      //       domain.id,
-      //       ramp.id,
-      //       parseFloat(weight),
-      //       parseFloat(currentRampBlockWeight),
-      //       parseFloat(currentRampBlockWeight) + parseFloat(weight),
-      //       dt2.block_id,
-      //       newDailyDispatch.id
-      //     ]
-      //   )
+    // Calculate total ramp weight
+    const totalRampWeight = rampBlockHistories.reduce(
+      (total, history) => total + history.previous_weight + history.weight,
+      0
+    )
+
+    // Distribute dispatched tonnage across blocks
+    for (const history of rampBlockHistories) {
+      const block = await fetchEntity(blockRepo, history.block_id)
+      const currentRampBlockWeight = history.previous_weight + history.weight
+      const percentage = parseFloat((currentRampBlockWeight / totalRampWeight).toFixed(4))
+      const weight = parseFloat((-dispatchedTonnage * percentage).toFixed(4))
 
       await generateRampBlockHistories(
         block,
@@ -195,22 +225,30 @@ export async function generateDispatchTransaction(
         ramp,
         'DISPATCH',
         dispatchDate,
-        parseFloat(weight),
+        weight,
         user,
         null,
-        newDailyDispatch,
+        dailyDispatch, // Pass dailyDispatch object
         tx
       )
-
-      // await txMgr.query(`
-      //   SELECT * FROM (
-      //     SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date desc) AS rn FROM ramp_block_histories
-      //     WHERE ramp_id =$1 AND transaction_date <= $2
-      //   ) foo WHERE rn = 1
-      // `, [dt.ramp_id, dt.transaction_date]
-      // )
-      let x = dt2
     }
-    let x = rampBlockHistory
   }
 }
+
+// async function validateOpeningQuantities(domain: Domain, ramp: Ramp, tx: EntityManager): Promise<void> {
+//   const rampBlockHistoryRepo = tx.getRepository(RampBlockHistory)
+
+//   const blocks = await tx.getRepository(Block).find({ where: { ramp } })
+
+//   for (const block of blocks) {
+//     const history = await rampBlockHistoryRepo.findOne({
+//       where: { domain, ramp, block, transactionType: 'OPENING_QUANTITY' }
+//     })
+
+//     if (!history) {
+//       throw new Error(
+//         `No opening quantity defined for block ${block.id} in ramp ${ramp.id}. Please set an opening quantity before creating dispatch records.`
+//       )
+//     }
+//   }
+// }