X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryPlan.pm;h=6d7aaa908ba19481eb1aaabd7de9808f5cacb2ae;hb=af0847405bd1a45eda7897a8bbfcb5b73a032580;hp=32939e0891bc3645fcccff5a6a66429c4515b254;hpb=c0714b3dd66a355cc2c2a548cb82414f86dca456;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm index 32939e089..6d7aaa908 100644 --- a/SL/Controller/DeliveryPlan.pm +++ b/SL/Controller/DeliveryPlan.pm @@ -9,13 +9,13 @@ use SL::DB::Business; use SL::Controller::Helper::GetModels; use SL::Controller::Helper::ReportGenerator; use SL::Locale::String; +use SL::Helper::ShippedQty; use SL::AM; use SL::DBUtils (); use Carp; use Rose::Object::MakeMethods::Generic ( - scalar => [ qw(db_args flat_filter) ], - 'scalar --get_set_init' => [ qw(models all_edit_right vc use_linked_items all_employees all_businesses) ], + 'scalar --get_set_init' => [ qw(models all_edit_right vc all_employees all_businesses all_departments) ], ); __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); }); @@ -26,7 +26,6 @@ my %sort_columns = ( partnumber => t8('Part Number'), qty => t8('Qty'), shipped_qty => t8('shipped'), - delivered_qty => t8('transferred in / out'), not_shipped_qty => t8('not shipped'), ordnumber => t8('Order'), customer => t8('Customer'), @@ -42,7 +41,7 @@ sub action_list { my $orderitems = $self->models->get; $self->calc_qtys($orderitems); $self->setup_list_action_bar; - $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems, action_bar => 1); + $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems); } # private functions @@ -54,7 +53,7 @@ sub prepare_report { my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(reqdate customer vendor ordnumber partnumber description qty shipped_qty not_shipped_qty delivered_qty); + my @columns = qw(reqdate customer vendor ordnumber partnumber description qty shipped_qty not_shipped_qty); my @sortable = qw(reqdate customer vendor ordnumber partnumber description); @@ -67,7 +66,6 @@ sub prepare_report { qty => { sub => sub { $_[0]->qty_as_number . ' ' . $_[0]->unit } }, shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]{shipped_qty}, 2) . ' ' . $_[0]->unit } }, not_shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty - $_[0]{shipped_qty}, 2) . ' ' . $_[0]->unit } }, - delivered_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]{delivered_qty}, 2) .' ' . $_[0]->unit } }, ordnumber => { sub => sub { $_[0]->order->ordnumber }, obj_link => sub { $self->link_to($_[0]->order) } }, vendor => { sub => sub { $_[0]->order->vendor->name }, @@ -92,7 +90,7 @@ sub prepare_report { ); $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options(qw(list filter vc use_linked_items)); + $report->set_export_options(qw(list filter vc)); $report->set_options_from_form; $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i; $self->models->finalize; # for filter laundering @@ -105,71 +103,26 @@ sub prepare_report { sub calc_qtys { my ($self, $orderitems) = @_; - # using $orderitem->shipped_qty 40 times is far too slow. need to do it manually - # return unless scalar @$orderitems; - my %orderitems_by_id = map { $_->id => $_ } @$orderitems; - - my $query = $self->use_linked_items ? _calc_qtys_query_linked_items(scalar @$orderitems) - : _calc_qtys_query_match_parts(scalar @$orderitems); - - my $result = SL::DBUtils::selectall_hashref_query($::form, $::form->get_standard_dbh, $query, map { $_->id } @$orderitems); - - for my $row (@$result) { - my $item = $orderitems_by_id{ $row->{id} }; - $item->{shipped_qty} ||= 0; - $item->{delivered_qty} ||= 0; - $item->{shipped_qty} += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty}; - $item->{delivered_qty} += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty} if $row->{delivered}; - } -} - -sub _calc_qtys_query_match_parts { - my ($num_items) = @_; - - my $query = <new() + ->calculate($orderitems) + ->write_to_objects; } sub make_filter_summary { my ($self) = @_; my $vc = $self->vc; - my ($business, $employee); + my ($business, $employee, $department); my $filter = $::form->{filter} || {}; my @filter_strings; $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"}; $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id}; + $department = SL::DB::Department->new(id => $filter->{order}{department_id})->load->description if $filter->{order}{department_id}; my @filters = ( [ $filter->{order}{"ordnumber:substr::ilike"}, $::locale->text('Number') ], @@ -184,6 +137,7 @@ sub make_filter_summary { [ $filter->{order}{customer}{"name:substr::ilike"}, $::locale->text('Customer') ], [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number') ], [ $business, $::locale->text('Customer type') ], + [ $department, $::locale->text('Department') ], [ $employee, $::locale->text('Employee') ], ); @@ -204,109 +158,6 @@ sub make_filter_summary { $self->{filter_summary} = join ', ', @filter_strings; } -sub delivery_plan_query { - my ($self) = @_; - my $vc = $self->vc; - my $employee_id = SL::DB::Manager::Employee->current->id; - my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND"; - - [ - "order.${vc}_id" => { gt => 0 }, - 'order.closed' => 0, - or => [ 'order.quotation' => 0, 'order.quotation' => undef ], - - # filter by shipped_qty < qty, read from innermost to outermost - 'id' => [ \" - -- 3. resolve the desired information about those - SELECT oi.id FROM ( - -- 2. slice only part, orderitem and both quantities from it - SELECT parts_id, trans_id, qty, SUM(doi_qty) AS doi_qty FROM ( - -- 1. join orderitems and deliverorder items via record_links. - -- also add customer data to filter for sales_orders - SELECT oi.parts_id, oi.trans_id, oi.id, oi.qty, doi.qty AS doi_qty - FROM orderitems oi, oe, record_links rl, delivery_order_items doi - WHERE - oe.id = oi.trans_id AND - oe.${vc}_id IS NOT NULL AND - (oe.quotation = 'f' OR oe.quotation IS NULL) AND - NOT oe.closed AND - $oe_owner - rl.from_id = oe.id AND - rl.from_id = oi.trans_id AND - oe.id = oi.trans_id AND - rl.from_table = 'oe' AND - rl.to_table = 'delivery_orders' AND - rl.to_id = doi.delivery_order_id AND - oi.parts_id = doi.parts_id - ) tuples GROUP BY parts_id, trans_id, qty - ) partials - LEFT JOIN orderitems oi ON partials.parts_id = oi.parts_id AND partials.trans_id = oi.trans_id - WHERE oi.qty > doi_qty - - UNION ALL - - -- 4. since the join over record_links fails for sales_orders without any delivery order - -- retrieve those without record_links at all - SELECT oi.id FROM orderitems oi, oe - WHERE - oe.id = oi.trans_id AND - oe.${vc}_id IS NOT NULL AND - (oe.quotation = 'f' OR oe.quotation IS NULL) AND - NOT oe.closed AND - $oe_owner - oi.trans_id NOT IN ( - SELECT from_id - FROM record_links rl - WHERE - rl.from_table ='oe' AND - rl.to_table = 'delivery_orders' - ) - - UNION ALL - - -- 5. now for the really nasty cases. - -- If someone partially delivered an order in several delivery orders, - -- there will be lots of record_links (4 doesn't catch those) but those - -- won't have matching part_ids in delivery_order_items, so 1-3 can't - -- find anything - -- In this case aggreg record_links - delivery_order - delivery_order_items - -- slice only oe.id, parts_id and sum of of qty - -- left join that onto orderitems to get matching qtys in doi while retaining - -- entrys without matches and then throw out those without record_links - -- TODO: join this and 1-3 into a general case - -- need debug info? uncomment these: - SELECT oi.id -- ,oi.trans_id, oi.parts_id, coalesce(sum, 0), agg.parts_id - FROM orderitems oi LEFT JOIN ( - SELECT rl.from_id as oid, doi.parts_id, sum(doi.qty) FROM ( - SELECT from_id, to_id - FROM record_links rl - LEFT JOIN oe ON oe.id = from_id - WHERE - rl.from_table = 'oe' AND - rl.to_table = 'delivery_orders' AND - - oe.${vc}_id IS NOT NULL AND - $oe_owner - (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed - ) rl - LEFT JOIN delivery_order_items doi ON (rl.to_id = doi.delivery_order_id) - GROUP BY rl.from_id, doi.parts_id - ) agg ON (agg.oid = oi.trans_id AND agg.parts_id = oi.parts_id) - LEFT JOIN oe ON oe.id = oi.trans_id - WHERE - EXISTS ( - SELECT to_id - FROM record_links rl - WHERE oi.trans_id = rl.from_id AND rl.from_table = 'oe' AND rl.to_table = 'delivery_orders' - ) AND - coalesce(sum, 0) < oi.qty AND - oe.${vc}_id IS NOT NULL AND - $oe_owner - (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed - " ], # make emacs happy again: ' - ] -} - sub delivery_plan_query_linked_items { my ($self) = @_; my $vc = $self->vc; @@ -348,12 +199,13 @@ sub delivery_plan_query_linked_items { (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed AND $oe_owner - oi.id NOT IN ( + NOT EXISTS ( SELECT from_id FROM record_links rl WHERE - rl.from_table ='orderitems' AND - rl.to_table = 'delivery_order_items' + rl.from_table = 'orderitems' AND + rl.to_table = 'delivery_order_items' AND + rl.from_id = oi.id ) " ], # make emacs happy again: " ] @@ -364,8 +216,7 @@ sub init_models { my ($self) = @_; my $vc = $self->vc; - my $query = $self->use_linked_items ? $self->delivery_plan_query_linked_items - : $self->delivery_plan_query; + my $query = $self->delivery_plan_query_linked_items; SL::Controller::Helper::GetModels->new( controller => $self, @@ -379,27 +230,26 @@ sub init_models { }, query => $query, with_objects => [ 'order', "order.$vc", 'part' ], - additional_url_params => { vc => $vc, use_linked_items => $self->use_linked_items }, + additional_url_params => { vc => $vc }, ); } sub init_all_edit_right { - $::auth->assert('sales_all_edit', 1) + return $_[0]->vc eq 'customer' ? $::auth->assert('sales_all_edit', 1) : $::auth->assert('purchase_all_edit', 1); } sub init_vc { return $::form->{vc} if ($::form->{vc} eq 'customer' || $::form->{vc} eq 'vendor') || croak "self (DeliveryPlan) has no vc defined"; } -sub init_use_linked_items { - !!$::form->{use_linked_items}; -} - sub init_all_employees { return SL::DB::Manager::Employee->get_all_sorted; } sub init_all_businesses { return SL::DB::Manager::Business->get_all_sorted; } +sub init_all_departments { + return SL::DB::Manager::Department->get_all_sorted; +} sub link_to { my ($self, $object, %params) = @_; @@ -411,7 +261,11 @@ sub link_to { my $vc = $object->is_sales ? 'customer' : 'vendor'; my $id = $object->id; - return "oe.pl?action=$action&type=$type&vc=$vc&id=$id"; + if ($::instance_conf->get_feature_experimental_order) { + return "controller.pl?action=Order/$action&type=$type&id=$id"; + } else { + return "oe.pl?action=$action&type=$type&vc=$vc&id=$id"; + } } if ($object->isa('SL::DB::Part')) { my $id = $object->id;