[Fixed] getMachineWorkingInformation() was implemented with 'static' machine id -> now dynamic
This commit is contained in:
parent
74bd22d1b9
commit
44347d46cc
|
@ -177,6 +177,7 @@
|
|||
|
||||
//TODO: GROUP_CONCAT(DISTINCT a.id_action ORDER BY a.id_action ASC)
|
||||
$u = Table::get('user')
|
||||
->whereIdWarehouse($id_warehouse)
|
||||
->select('id_user')
|
||||
->select('code');
|
||||
|
||||
|
@ -184,7 +185,8 @@
|
|||
->join('id_user', $u);
|
||||
|
||||
$m = Table::get('machine')
|
||||
->whereId(5);
|
||||
->whereIdWarehouse($id_warehouse)
|
||||
->whereId($id_machine);
|
||||
|
||||
$mcm = Table::get('machine_cluster_merge')
|
||||
->join('id_machine', $m);
|
||||
|
|
Loading…
Reference in New Issue