@things-factory/operato-pms 3.8.13 → 3.8.26

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

@@ -52,10 +52,10 @@ export const dailyProductionReports = {
         CREATE TEMP TABLE temp_records on commit drop AS (	
           select blk.block_id, coalesce(sum(field_bunches),0) AS today_field_bunches, 
           round(coalesce(sum(ramp_weight),0)::numeric,4) AS today_ramp_weight,
-          sum(case when transaction_type = 'HARVEST' then field_bunches else 0 end) as today_bunch_harvest,
-          sum(case when transaction_type = 'LOADING' then -field_bunches else 0 end) as today_bunch_collected,
-          round(sum(case when transaction_type = 'LOADING' then ramp_weight else 0 end)::numeric,4) as today_ramp_weight_collected,
-          round(sum(case when transaction_type = 'DISPATCHMENT' then -ramp_weight else 0 end)::numeric,4) as today_weight_dispatch,	  
+          sum(case when transaction_type = 'HARVEST' OR transaction_type = 'BUNCHES_ADJUSTMENT' then field_bunches else 0 end) as today_bunch_harvest,
+          sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then -field_bunches else 0 end) as today_bunch_collected,
+          round(sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then ramp_weight else 0 end)::numeric,4) as today_ramp_weight_collected,
+          round(sum(case when transaction_type = 'DISPATCHMENT' OR transaction_type = 'DISPATCHMENT_ADJUSTMENT' then -ramp_weight else 0 end)::numeric,4) as today_weight_dispatch,	  
           transaction_date
           from record_transactions t2
           inner join temp_blocks blk on blk.id = t2.block_id
@@ -127,11 +127,11 @@ export const dailyProductionReports = {
       )
 
       const result: any = await tx.query(`
-            select * from temp_daily_production_data dt
+        select * from temp_daily_production_data dt
       `)
 
       const total: any = await tx.query(`
-          select count(*) from temp_daily_production_data
+        select count(*) from temp_daily_production_data
       `)
 
       let items = result.map(itm => {

package/server/graphql/resolvers/report/index.ts

@@ -5,6 +5,7 @@ import { yearlyProductionReports } from './yearly-production-reports'
 import { dailyStaffHarvestReports } from './daily-staff-harvest-reports'
 import { monthlyBlockDispatchReports } from './monthly-block-dispatch-reports'
 import { monthlyFfbSaleReports } from './monthly-ffb-sale-reports'
+import { dailyFfbDispatchProductionReports } from './daily-ffb-dispatch-production-reports'
 
 export const ReportResolver = {
   Query: {
@@ -14,7 +15,8 @@ export const ReportResolver = {
     ...yearlyProductionReports,
     ...dailyStaffHarvestReports,
     ...monthlyBlockDispatchReports,
-    ...monthlyFfbSaleReports
+    ...monthlyFfbSaleReports,
+    ...dailyFfbDispatchProductionReports
   },
   Mutation: {}
 }

package/server/graphql/resolvers/report/monthly-block-dispatch-reports.ts

@@ -1,7 +1,7 @@
 import { EntityManager, getRepository, Not, IsNull } from 'typeorm'
 
 import { ListParam, Domain } from '@things-factory/shell'
-import { Ramp } from '../../../entities'
+import { Block, Ramp } from '../../../entities'
 
 export const monthlyBlockDispatchReports = {
   async monthlyBlockDispatchReports(_: any, params: ListParam, context: any) {
@@ -27,11 +27,13 @@ export const monthlyBlockDispatchReports = {
         String(toDate.getDate()).padStart(2, '0')
       ].join('-')
 
-      let ramps = await getRepository(Ramp).find({
-        where: { domain: domain.id, deletedAt: IsNull() },
-        relations: ['block']
-      })
-
+      let blocks = await tx.getRepository(Block).query(`
+        SELECT b.id, b.name FROM ramps r
+        INNER JOIN blocks b ON b.id = r.block_id 
+        WHERE b.deleted_at IS NULL
+        AND r.domain_id = $1
+        GROUP BY b.id, b.name
+      `, [domain.id])
 
       // --  WHERE dd.dispatch_at::timestamp between $1::timestamp and $2::timestamp
       // [fromDateString, toDateString]
@@ -56,8 +58,8 @@ export const monthlyBlockDispatchReports = {
           CREATE TEMP TABLE pivot_block_dispatch ON COMMIT DROP AS (
             SELECT * FROM crosstab(
               $$SELECT rbd.id, rbd.block_name, round(rbd.weight, 2 )::varchar FROM raw_block_dispatch rbd$$,
-              $$SELECT b.name FROM ramps r INNER JOIN blocks b ON b.id = r.block_id WHERE r.deleted_at IS NULL$$
-            ) AS ("id" uuid,  ${ramps.map(ramp => `"${ramp.block.name}" varchar`).join(',')})
+              $$SELECT b.name FROM ramps r INNER JOIN blocks b ON b.id = r.block_id WHERE r.deleted_at IS NULL AND r.domain_id = '${domain.id}' GROUP BY b.id, b.name$$
+            ) AS ("id" uuid,  ${blocks.map(block => `"${block.name}" varchar`).join(',')})
           );
         `)
 
@@ -73,7 +75,7 @@ export const monthlyBlockDispatchReports = {
             , dd.transport_no as "lorryNo"
             , dd.driver_identification as "driverIdentification"
             , TO_CHAR(dd.dispatch_at:: DATE, 'dd/mm/yyyy') as "date"
-            , row_to_json((SELECT d FROM (SELECT ${ramps.map(ramp => `pbd."${ramp.block.name}"`).join(',')}) d))::varchar as "blockData"
+            , row_to_json((SELECT d FROM (SELECT ${blocks.map(block => `pbd."${block.name}"`).join(',')}) d))::varchar as "blockData"
             , (SELECT sum(weight) FROM raw_block_dispatch rbd WHERE rbd.id = dd.id) AS "today"
             FROM daily_dispatches dd 
             INNER JOIN pivot_block_dispatch pbd ON pbd.id = dd.id

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

@@ -46,7 +46,7 @@ export const monthlyFfbSaleReports = {
             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",
-            CASE WHEN forward_rn = 1 THEN dispatch_at::date::varchar ELSE '' END AS "dispatchAt", 
+            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",

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

@@ -78,8 +78,8 @@ export const monthlyProductionReports = {
             left join(
               select blk.block_id, sum(total_weight) as total_weight_loaded, sum(total_bunch) as total_bunch_loaded
               from daily_loadings dl 
-              inner join temp_blocks blk on blk.id = dl.block_id
               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
               group by blk.block_id
             ) as loading on loading.block_id = b.id

package/server/graphql/types/report/daily-ffb-dispatch-production-report-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const DailyFfbDispatchProductionReportList = gql`
+  type DailyFfbDispatchProductionReportList {
+    items: [DailyFfbDispatchProductionReport]
+    total: Int
+  }
+`

package/server/graphql/types/report/daily-ffb-dispatch-production-report.ts

@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const DailyFfbDispatchProductionReport = gql`
+  type DailyFfbDispatchProductionReport {
+    date: String
+    blockData: String 
+    today: String 
+  }
+`

package/server/graphql/types/report/index.ts

@@ -12,16 +12,20 @@ export * from './monthly-production-report-list'
 export * from './monthly-production-report'
 export * from './yearly-production-report-list'
 export * from './yearly-production-report'
+export * from './daily-ffb-dispatch-production-report'
+export * from './daily-ffb-dispatch-production-report-list'
 
 export const ReportResolver = gql`
   extend type Query {
     dailyProductionReports(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DailyProductionReportList
       @transaction
+      
     monthlyProductionReports(
       filters: [Filter]
       pagination: Pagination
       sortings: [Sorting]
     ): MonthlyProductionReportList @transaction
+
     yearlyProductionReports(filters: [Filter], pagination: Pagination, sortings: [Sorting]): YearlyProductionReportList
       @transaction
     dailyStaffHarvestReports(
@@ -29,21 +33,30 @@ export const ReportResolver = gql`
       pagination: Pagination
       sortings: [Sorting]
     ): DailyStaffHarvestReportList @transaction
+
     monthlyDispatchSummaryReports(
       filters: [Filter], 
       pagination: Pagination, 
       sortings: [Sorting]
     ): MonthlyDispatchSummaryReportList @transaction
+
     monthlyBlockDispatchReports(
       filters: [Filter], 
       pagination: Pagination, 
       sortings: [Sorting]
     ): MonthlyBlockDispatchReportList @transaction
+
     monthlyFfbSaleReports(
       filters: [Filter], 
       pagination: Pagination, 
       sortings: [Sorting]
     ): MonthlyDispatchSummaryReportList @transaction
+
+    dailyFfbDispatchProductionReports(
+      filters: [Filter], 
+      pagination: Pagination, 
+      sortings: [Sorting]
+    ): DailyFfbDispatchProductionReportList @transaction
   }
   
 `

package/server/utils/core-values.ts

@@ -43,8 +43,8 @@ export async function getDailyBlockCalculatedValues(
           select block_id, transaction_date, 
           (select opening_field_bunches from transactions dt where dt.block_id = trx.block_id and dt.seq = min(trx.seq)) as prev_bunch_bal_in_field,
           0 as prev_weight_bal_in_ramp,
-          sum(case when transaction_type = 'HARVEST' then field_bunches else 0 end) as today_bunch_harvest,
-          sum(case when transaction_type = 'LOADING' then -field_bunches else 0 end) as today_bunch_collected,
+          sum(case when transaction_type = 'HARVEST' OR transaction_type = 'BUNCHES_ADJUSTMENT' then field_bunches else 0 end) as today_bunch_harvest,
+          sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then -field_bunches else 0 end) as today_bunch_collected,
           0 as today_weight_dispatch, 
           0 as today_weight_bal_in_ramp, 
           (

package/server/utils/transaction-util.ts

@@ -47,7 +47,8 @@ export async function generateTransactionHistory(
   if (
     transactionType === TRANSACTION_TYPE.LOADING ||
     transactionType === TRANSACTION_TYPE.DISPATCHMENT ||
-    transactionType === TRANSACTION_TYPE.TONNAGE_ADJUSTMENT
+    transactionType === TRANSACTION_TYPE.LOADING_ADJUSTMENT ||
+    transactionType === TRANSACTION_TYPE.DISPATCHMENT_ADJUSTMENT
   ) {
     await switchRampStatus(domain, ramp, user, trxMgr)
   }

package/translations/en.json

@@ -8,8 +8,8 @@
   "field.available_tonnage": "available tonnage",
   "field.avg_out_turn": "avg out turn",
   "field.avg": "avg",
-  "field.balance_bunch": "balance bunch",
   "field.balance_bunch_in_field": "balance bunch in field",
+  "field.balance_bunch": "balance bunch",
   "field.block": "block",
   "field.bunches_per_hectar": "bunches per hectar",
   "field.bunches_per_palm": "bunches per palm",
@@ -97,7 +97,7 @@
   "field.total_out_turn": "total out turn",
   "field.total_stand": "total stand",
   "field.total_task_covered": "total task covered",
-  "field.total_tonnage_harvested": "total tonnage harvested",
+  "field.total_tonnage_estimated": "total tonnage (estimated)",
   "field.total_tonnage_release": "total tonnage release",
   "field.total_tonnage": "total tonnage",
   "field.total_weight_loaded": "total weight loaded",
@@ -138,17 +138,17 @@
   "label.lorry_no": "lorry no",
   "label.mill": "mill",
   "label.owner": "owner",
-  "label.percentage": "percentage",
+  "label.oer_percentage": "OER percentage",
   "label.please_select_a_block": "please select a block",
   "label.rainfall": "rainfall",
-  "label.total_bunch": "total bunch",
   "label.total_bunch_harvested": "total bunch harvested",
   "label.total_bunch_in_field": "total bunch in field",
   "label.total_bunch_loaded": "total bunch loaded",
+  "label.total_bunch": "total bunch",
   "label.total_number_of_bunches": "total no. of bunches",
   "label.total_task_covered": "total task covered",
-  "label.total_tonnage": "total tonnage",
   "label.total_tonnage_loaded": "total tonnage loaded",
+  "label.total_tonnage": "total tonnage",
   "label.truck_driver": "truck driver",
   "label.truck_no": "truck no",
   "label.yesterday_balance_bunch": "yesterday balance bunch",
@@ -163,6 +163,7 @@
   "text.delete_dispatchment_record": "delete dispatchment record",
   "text.delete_harvesting_record": "delete harvesting record",
   "text.delete_loading_record": "delete loading record",
+  "text.destination_is_not_selected": "destination is not selected",
   "text.dispatch_record_created": "dispatch record created",
   "text.dispatch_record_invalid": "dispatch record invalid",
   "text.dispatchment_record_has_been_deleted": "dispatchment record has been deleted",
@@ -186,7 +187,6 @@
   "text.loading_record_has_been_deleted": "loading record has been deleted",
   "text.loading_record_invalid": "loading record invalid",
   "text.loading_record_updated": "loading record updated",
-  "text.destination_is_not_selected": "destination is not selected",
   "text.no_adjustment_can_be_submitted": "no adjustment can be submitted",
   "text.no_records_in_dispatchment_list": "no records in dispatchment list",
   "text.no_records_in_loading_list": "no records in loading list",
@@ -218,6 +218,7 @@
   "title.create_dispatchment_record": "create dispatchment record",
   "title.create_harvesting_record": "create harvesting record",
   "title.create_loading_record": "create loading record",
+  "title.daily_ffb_dispatch_and_production": "daily FFB dispatch and production",
   "title.daily_loading_record": "daily loading record",
   "title.daily_production_report": "daily production report",
   "title.daily_staff_harvest": "daily staff harvest",

package/translations/ko.json

@@ -25,12 +25,12 @@
   "field.status": "status",
   "field.task_no": "task no",
   "field.total_bunch": "total bunch",
-  "field.total_tonnage": "total tonnage",
   "field.total_harvested": "total harvested",
   "field.total_hectarage": "total hectarage",
   "field.total_no_of_bunches": "total no of bunches",
   "field.total_stand": "total stand",
-  "field.total_tonnage_harvested": "total tonnage harvested",
+  "field.total_tonnage": "total tonnage",
+  "field.total_tonnage_estimated": "total tonnage (estimated)",
   "field.total_weight_loaded": "total weight loaded",
   "field.total_weight": "total weight",
   "field.trip": "trip",
@@ -47,7 +47,7 @@
   "label.harvesting_round": "harvesting round",
   "label.loading_date": "loading date",
   "label.owner": "owner",
-  "label.percentage": "percentage",
+  "label.oer_percentage": "OER percentage",
   "label.please_select_a_block": "please select a block",
   "label.rainfall": "rainfall",
   "label.total_bunch_harvested": "total bunch harvested",
@@ -58,12 +58,12 @@
   "text.code-management": "[ko] code management",
   "text.create_harvesting_record": "create harvesting record",
   "text.create_loading_record": "create loading record",
+  "text.destination_is_not_selected": "destination is not selected",
   "text.empty_value_in_list": "empty value in record list",
   "text.harvesting_record_created": "harvesting record created",
   "text.harvesting_record_invalid": "harvesting record invalid",
   "text.loading_record_created": "loading record created",
   "text.loading_record_invalid": "loading record invalid",
-  "text.destination_is_not_selected": "destination is not selected",
   "text.invalid_percentage_value": "invalid percentage value",
   "text.no_records": "no records",
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
@@ -81,6 +81,7 @@
   "title.company": "company",
   "title.create_harvesting_record": "create harvesting record",
   "title.create_loading_record": "create loading record",
+  "title.daily_ffb_dispatch_and_production": "daily FFB dispatch and production",
   "title.daily_loading_record": "daily loading record",
   "title.daily_production_report": "daily production report",
   "title.global_plantation_setting": "[ko] global plantation setting",
@@ -99,6 +100,6 @@
   "title.overall_record": "overall record",
   "title.plantation_setting": "plantation setting",
   "title.ramp": "ramp",
-  "title.staff": "staff",
-  "title.select_destination": "select destination"
+  "title.select_destination": "select destination",
+  "title.staff": "staff"
 }

package/translations/ms.json

@@ -25,15 +25,15 @@
   "field.status": "status",
   "field.task_no": "task no",
   "field.total_bunch": "total bunch",
-  "field.total_tonnage": "total tonnage",
-  "field.total_weight": "total weight",
-  "field.total_weight_loaded": "total weight loaded",
-  "field.trip": "trip",
   "field.total_harvested": "total harvested",
   "field.total_hectarage": "total hectarage",
   "field.total_no_of_bunches": "total no of bunches",
   "field.total_stand": "total stand",
-  "field.total_tonnage_harvested": "total tonnage harvested",
+  "field.total_tonnage": "total tonnage",
+  "field.total_weight_loaded": "total weight loaded",
+  "field.total_weight": "total weight",
+  "field.trip": "trip",
+  "field.total_tonnage_estimated": "total tonnage (estimated)",
   "field.type": "type",
   "field.valid_from": "valid from",
   "field.year_planted": "year planted",
@@ -47,7 +47,7 @@
   "label.harvesting_round": "harvesting round",
   "label.loading_date": "loading date",
   "label.owner": "owner",
-  "label.percentage": "percentage",
+  "label.oer_percentage": "OER percentage",
   "label.please_select_a_block": "please select a block",
   "label.rainfall": "rainfall",
   "label.total_bunch_harvested": "total bunch harvested",
@@ -58,12 +58,12 @@
   "text.code-management": "[ms] code management",
   "text.create_harvesting_record": "create harvesting record",
   "text.create_loading_record": "create loading record",
+  "text.destination_is_not_selected": "destination is not selected",
   "text.empty_value_in_list": "empty value in record list",
   "text.harvesting_record_created": "harvesting record created",
   "text.harvesting_record_invalid": "harvesting record invalid",
   "text.loading_record_created": "loading record created",
   "text.loading_record_invalid": "loading record invalid",
-  "text.destination_is_not_selected": "destination is not selected",
   "text.no_records": "no records",
   "text.invalid_percentage_value": "invalid percentage value",
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
@@ -81,6 +81,7 @@
   "title.company": "syarikat",
   "title.create_harvesting_record": "create harvesting record",
   "title.create_loading_record": "create loading record",
+  "title.daily_ffb_dispatch_and_production": "daily FFB dispatch and production",
   "title.daily_loading_record": "daily loading record",
   "title.daily_production_report": "daily production report",
   "title.global_plantation_setting": "[ms] global plantation setting",
@@ -99,6 +100,6 @@
   "title.overall_record": "overall record",
   "title.plantation_setting": "plantation setting",
   "title.ramp": "ramp",
-  "title.staff": "staff",
-  "title.select_destination": "select destination"
+  "title.select_destination": "select destination",
+  "title.staff": "staff"
 }

package/translations/zh.json

@@ -25,12 +25,12 @@
   "field.status": "status",
   "field.task_no": "task no",
   "field.total_bunch": "total bunch",
-  "field.total_tonnage": "total tonnage",
   "field.total_harvested": "total harvested",
   "field.total_hectarage": "total hectarage",
   "field.total_no_of_bunches": "total no of bunches",
   "field.total_stand": "total stand",
-  "field.total_tonnage_harvested": "total tonnage harvested",
+  "field.total_tonnage": "total tonnage",
+  "field.total_tonnage_estimated": "total tonnage (estimated)",
   "field.total_weight_loaded": "total weight loaded",
   "field.total_weight": "total weight",
   "field.trip": "trip",
@@ -47,7 +47,7 @@
   "label.harvesting_round": "harvesting round",
   "label.loading_date": "loading date",
   "label.owner": "owner",
-  "label.percentage": "percentage",
+  "label.oer_percentage": "OER percentage",
   "label.please_select_a_block": "please select a block",
   "label.rainfall": "rainfall",
   "label.total_bunch_harvested": "total bunch harvested",
@@ -58,12 +58,12 @@
   "text.code-management": "[zh] code management",
   "text.create_harvesting_record": "create harvesting record",
   "text.create_loading_record": "create loading record",
+  "text.destination_is_not_selected": "destination is not selected",
   "text.empty_value_in_list": "empty value in record list",
   "text.harvesting_record_created": "harvesting record created",
   "text.harvesting_record_invalid": "harvesting record invalid",
   "text.loading_record_created": "loading record created",
   "text.loading_record_invalid": "loading record invalid",
-  "text.destination_is_not_selected": "destination is not selected",
   "text.no_records": "no records",
   "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",
@@ -81,6 +81,7 @@
   "title.company": "company",
   "title.create_harvesting_record": "create harvesting record",
   "title.create_loading_record": "create loading record",
+  "title.daily_ffb_dispatch_and_production": "daily FFB dispatch and production",
   "title.daily_loading_record": "daily loading record",
   "title.daily_production_report": "daily production report",
   "title.global_plantation_setting": "[zh] global plantation setting",
@@ -99,6 +100,6 @@
   "title.overall_record": "overall record",
   "title.plantation_setting": "plantation setting",
   "title.ramp": "ramp",
-  "title.staff": "staff",
-  "title.select_destination": "select destination"
+  "title.select_destination": "select destination",
+  "title.staff": "staff"
 }