Browse Source

fix: information overhead in report

pull/1/head
wahyun 2 months ago
parent
commit
5717fd4150
  1. 31
      app/Http/Controllers/AssignMaterialController.php

31
app/Http/Controllers/AssignMaterialController.php

@ -152,22 +152,21 @@ class AssignMaterialController extends Controller
{
$id_activity = $request->query('idact');
$query = AssignMaterial::select(
DB::raw('(SELECT SUM(assign_material_to_activity.qty_planning) FROM assign_material_to_activity WHERE assign_material_to_activity.activity_id = ram.activity_id) as qty_planning'),
DB::raw('SUM(ram.qty) as qty_sum'),
"m.description as material_name",
"assign_material_to_activity.activity_id"
)
->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id");
if (!AssignMaterial::join("report_activity_material as ram", "ram.assign_material_id", "=", "assign_material_to_activity.id")->where("assign_material_to_activity.activity_id", $id_activity)->exists()) {
$query->leftJoin("report_activity_material as ram", "ram.assign_material_id", "=", "assign_material_to_activity.id");
} else {
$query->join("report_activity_material as ram", "ram.assign_material_id", "=", "assign_material_to_activity.id");
}
$data = $query->groupBy("m.description")
->groupBy("ram.activity_id")
->groupBy("assign_material_to_activity.activity_id")
->where("assign_material_to_activity.activity_id", $id_activity)
->get();
DB::raw('SUM(assign_material_to_activity.qty_planning) as qty_planning'),
"m.description as material_name",
"assign_material_to_activity.activity_id",
DB::raw('SUM(assign_material_to_activity.id) as id'),
"m.uom",
)
->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id");
$data = $query->groupBy("m.description")
->groupBy("assign_material_to_activity.activity_id")
->groupBy("m.uom")
// ->groupBy("assign_material_to_activity.id")
->where("assign_material_to_activity.activity_id", $id_activity)
->get();
return Datatables::of($data)
->addIndexColumn()
// ->addColumn('qty_planning', function($row){

Loading…
Cancel
Save