@things-factory/operato-pms 4.3.595 → 4.3.601

package/server/graphql/resolvers/report/monthly-ffb-sale-reports.ts

@@ -6,7 +6,7 @@ import { Ramp } from '../../../entities'
 export const monthlyFfbSaleReports = {
   async monthlyFfbSaleReports(_: any, params: ListParam, context: any) {
     try {
-      const { domain, tx }: { domain: Domain, tx: EntityManager } = context.state
+      const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
 
       let year = parseInt(params.filters.filter(x => x.name == 'month')[0].value.split('-')[0])
       let month = parseInt(params.filters.filter(x => x.name == 'month')[0].value.split('-')[1])
@@ -32,28 +32,42 @@ export const monthlyFfbSaleReports = {
         `
         CREATE TEMP TABLE raw_block_dispatch ON COMMIT DROP AS (
           SELECT dd.*,
-          COALESCE((SELECT SUM(COALESCE(ddd.adjusted_weight, ddd.collected_ramp_weight, 0)) FROM daily_dispatch_details ddd WHERE ddd.daily_dispatch_id = dd.id),0) AS tonnage
+          COALESCE((SELECT SUM(COALESCE(ddd.adjusted_weight, ddd.collected_ramp_weight, 0)) FROM daily_dispatch_details ddd WHERE ddd.daily_dispatch_id = dd.id AND ddd.deleted_at is null),0) AS tonnage
           FROM daily_dispatches dd 
           WHERE dd.dispatch_date::timestamp between $1::timestamp and $2::timestamp
           AND dd.deleted_at is null
-          ${organization ? organization.value == 'null' ? `AND dd.dispatch_to_id IS NULL` : `AND dd.dispatch_to_id = '${organization.value}'` : ''}
+          ${
+            organization
+              ? organization.value == 'null'
+                ? `AND dd.dispatch_to_id IS NULL`
+                : `AND dd.dispatch_to_id = '${organization.value}'`
+              : ''
+          }
         );
-        `, [fromDateString, toDateString]
+        `,
+        [fromDateString, toDateString]
       )
 
       await tx.query(
         `
           CREATE TEMP TABLE temp_monthly_dispatch_to_mill_data ON COMMIT DROP AS (
             SELECT "id", dispatch_at, transport_no AS "lorryNo", 
-            driver_identification AS "driverIdentification", chit_no AS "chitNo",	round(COALESCE(percentage,0)::numeric, 2)::varchar AS "percentage", 
-            COALESCE(diapatch_to_name, 'UNKNOWN') AS "dispatchTo", round(COALESCE(tonnage,0), 2)::varchar AS "tonnage",
+            COALESCE(diapatch_to_name, 'UNKNOWN') AS "dispatchTo", 
+            driver_identification AS "driverIdentification", chit_no AS "chitNo",
             CASE WHEN forward_rn = 1 THEN TO_CHAR(dispatch_at:: DATE, 'dd/mm/yyyy') ELSE '' END AS "dispatchAt", 
-            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (PARTITION BY dispatch_to_id, dispatch_at::date ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0)/forward_rn)::numeric,2)::varchar ELSE '' END AS "todayAvg",
-            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (PARTITION BY dispatch_to_id ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0)/forward_rn)::numeric,2)::varchar ELSE '' END AS "todateAvg",
-            CASE WHEN reverse_rn = 1 THEN round(coalesce(sum(tonnage) over (PARTITION BY dispatch_to_id, dispatch_at::date ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar ELSE '' END AS "today",
-            CASE WHEN reverse_rn = 1 THEN round(coalesce(sum(tonnage) over (PARTITION BY dispatch_to_id ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar ELSE '' END AS "todate"
+            round(COALESCE(percentage,0)::numeric, 2)::varchar AS "percentage", round(COALESCE(tonnage,0), 2)::varchar AS "tonnage",
+            rn, forward_rn, reverse_rn,
+            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (PARTITION BY dispatch_at::date ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0))::numeric,2)::varchar ELSE '' END AS "todaytotal",
+            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0))::numeric,2)::varchar ELSE '' END AS "total",
+            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (PARTITION BY dispatch_at::date ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0)/forward_rn)::numeric,2)::varchar ELSE '' END AS "todayAvg",
+            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0)/rn)::numeric,2)::varchar ELSE '' END AS "todateAvg",
+            CASE WHEN reverse_rn = 1 THEN round(coalesce(sum(tonnage) over (PARTITION BY dispatch_at::date ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar ELSE '' END AS "today",
+            CASE WHEN reverse_rn = 1 THEN round(coalesce(sum(tonnage) over (ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar ELSE '' END AS "todate"
             FROM (
               SELECT 
+              ROW_NUMBER() OVER(
+                ORDER BY rbd.dispatch_at ASC
+              ) as rn,
               ROW_NUMBER() OVER(
                 PARTITION BY rbd.dispatch_at::date
                 ORDER BY rbd.dispatch_at ASC
@@ -93,13 +107,13 @@ export const monthlyFfbSaleReports = {
         `
       )
 
-
       return {
         items: result.map(itm => {
           return {
             ...itm
           }
-        }), total: total[0].count
+        }),
+        total: total[0].count
       }
     } catch (error) {
       throw error

package/server/graphql/resolvers/report/monthly-production-reports.ts

@@ -73,6 +73,7 @@ export const monthlyProductionReports = {
               inner join temp_blocks blk on blk.id = dh.block_id
               inner join daily_harvest_details dhd on dhd.daily_harvest_id = dh.id
               where dh.harvest_date::timestamp between $1::timestamp and $2::timestamp
+              and dhd.deleted_at is null
               group by blk.block_id
             ) as harvest on harvest.block_id = b.id
             left join(
@@ -82,6 +83,7 @@ export const monthlyProductionReports = {
               inner join daily_loading_details dld on dld.daily_loading_id = dl.id
               inner join temp_blocks blk on blk.id = dld.block_id
               where dl.loading_date::timestamp between $1::timestamp and $2::timestamp
+              and dld.deleted_at is null
               group by blk.block_id
             ) as loading on loading.block_id = b.id
             left join(
@@ -105,14 +107,14 @@ export const monthlyProductionReports = {
         select count(*) from temp_monthly_production_data
       `)
 
-
       return {
         items: result.map(itm => {
           return {
             ...itm,
-            avgOutTurn: ((parseFloat(itm.totalOutTurn) / parseFloat(itm.daysWorked)) || 0).toFixed(4)
+            avgOutTurn: (parseFloat(itm.totalOutTurn) / parseFloat(itm.daysWorked) || 0).toFixed(4)
           }
-        }), total: total[0].count
+        }),
+        total: total[0].count
       }
     } catch (error) {
       throw error

package/server/graphql/resolvers/report/yearly-production-reports.ts

@@ -63,16 +63,18 @@ export const yearlyProductionReports = {
               select blk.block_id, sum(ramp_weight) as total_ffb 
               from record_transactions t               
               inner join temp_blocks blk on blk.id = t.block_id
-              where transaction_type = 'LOADING' 
+              where (transaction_type = 'LOADING' or transaction_type = 'LOADING_ADJUSTMENT')
               and transaction_date::timestamp between $2::timestamp and $3::timestamp
+              and t.deleted_at is null
               group by blk.block_id
             ) trans on trans.block_id = b.id
             left join (
               select blk.block_id, sum(ramp_weight) as total_ffb 
               from record_transactions t 
               inner join temp_blocks blk on blk.id = t.block_id
-              where transaction_type = 'LOADING' 
+              where (transaction_type = 'LOADING' or transaction_type = 'LOADING_ADJUSTMENT')
               and transaction_date::timestamp between $1::timestamp and $2::timestamp
+              and t.deleted_at is null
               group by blk.block_id
             ) last_trans on last_trans.block_id = b.id
             left join (
@@ -80,6 +82,7 @@ export const yearlyProductionReports = {
               from daily_harvests dh
               inner join temp_blocks blk on blk.id = dh.block_id
               where harvest_date::timestamp between $2::timestamp and $3::timestamp
+              and dh.deleted_at is null
               group by blk.block_id
             ) harvest on harvest.block_id = b.id
             where b.deleted_at is null

package/server/graphql/types/daily-loading-detail/daily-loading-detail-patch.ts

@@ -9,6 +9,8 @@ export const DailyLoadingDetailPatch = gql`
     ramp: ObjectRef
     totalBunchLoaded: Int
     totalBunchWeight: Float
+    prevTotalBunchLoaded: Int
+    prevTotalBunchWeight: Float
     remark: String
   }
 `

package/server/utils/transaction-util.ts

@@ -80,7 +80,7 @@ export async function updateTransactionHistory(
 
       await transactionRepo.update(
         { id: existingTransactionRecord.id },
-        { fieldBunches: totalBunches, updater: user, updatedAt: new Date() }
+        { fieldBunches: totalBunches, transactionDate, block, updater: user, updatedAt: new Date() }
       )
   }
 
@@ -104,70 +104,50 @@ export async function generateRampBlockHistories(
   dailyDispatch?: DailyDispatch,
   trxMgr?: EntityManager
 ): Promise<RampBlockHistory> {
-  console.log(block, domain, ramp, user)
   const rampBlockHistoryRepo: Repository<RampBlockHistory> =
     trxMgr?.getRepository(RampBlockHistory) || getRepository(RampBlockHistory)
 
   if (!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: RampBlockHistory = await rampBlockHistoryRepo.findOne({
     where: { domain, ramp, block },
-    order: { seq: 'DESC' }
+    order: { createdAt: 'DESC' }
   })
 
-  let res: any
-
-  if (!lastRampBlockHistory) {
-    res = await rampBlockHistoryRepo
-      .createQueryBuilder()
-      .insert()
-      .into(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: number = lastRampBlockHistory.currentWeight
-
-    res = await rampBlockHistoryRepo
-      .createQueryBuilder()
-      .insert()
-      .into(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: number = lastRampBlockHistory.currentWeight
+
+  const res: any = await rampBlockHistoryRepo
+    .createQueryBuilder()
+    .insert()
+    .into(RampBlockHistory)
+    .values([
+      {
+        domain,
+        block,
+        ramp,
+        transactionType,
+        transactionDate,
+        weight: rampWeight,
+        previousWeight,
+        currentWeight: parseFloat((previousWeight + rampWeight).toFixed(4)),
+        dailyDispatch, // Include dailyDispatch object
+        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: RampBlockHistory = res.generatedMaps[0]
 
   return newRampBlockHistory

package/translations/en.json

@@ -200,7 +200,7 @@
   "text.there_is_no_selected_items": "there is no selected items",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.truck_is_not_selected": "truck not selected",

package/translations/ja.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",

package/translations/ko.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",

package/translations/ms.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",

package/translations/zh.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",