diff --git a/build/database/repo/action_merge.php b/build/database/repo/action_merge.php index dda1efb..1e80fc0 100755 --- a/build/database/repo/action_merge.php +++ b/build/database/repo/action_merge.php @@ -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);