X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryPlan.pm;h=ebb0dba503513a08f9d0649c9e5c2609bec77d5e;hb=4f14c25d5726275ba6805480d974190ee80c187e;hp=8d2417eb568b6b658ff76ec3639faeabe6a77fcd;hpb=a54fb4aaa1dfd04290aadf93f30641f9b91156b0;p=kivitendo-erp.git

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index 8d2417eb5..ebb0dba50 100644
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -9,11 +9,13 @@ use SL::DB::Business;
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
 use SL::Locale::String;
+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 mode vc all_employees) ],
+  'scalar --get_set_init' => [ qw(models all_edit_right mode vc all_employees all_businesses) ],
 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });
@@ -40,8 +42,7 @@ sub action_list {
   $self->prepare_report;
 
   my $orderitems = $self->models->get;
-  $self->{all_businesses} = SL::DB::Manager::Business->get_all_sorted;
-
+  $self->calc_qtys($orderitems);
   $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems);
 }
 
@@ -71,11 +72,11 @@ sub prepare_report {
                                              ($rp_csv_mod ? '' : ' ' .  $_[0]->unit)                                         } },
     unit              => {      sub => sub {  $_[0]->unit                                                                    },
                             visible => $rp_csv_mod                                                                           },
-    shipped_qty       => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->shipped_qty, 2) .
+    shipped_qty       => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]{shipped_qty}, 2) .
                                              ($rp_csv_mod ? '' : ' ' .  $_[0]->unit)                                         } },
-    not_shipped_qty   => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty - $_[0]->shipped_qty, 2) .
+    not_shipped_qty   => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty - $_[0]{shipped_qty}, 2) .
                                              ($rp_csv_mod ? '' : ' ' .  $_[0]->unit)                                         } },
-    delivered_qty     => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->delivered_qty, 2) .
+    delivered_qty     => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]{delivered_qty}, 2) .
                                              ($rp_csv_mod ? '' : ' ' .  $_[0]->unit)                                         } },
     ordnumber         => {      sub => sub { $_[0]->order->ordnumber                                                         },
                            obj_link => sub { $self->link_to($_[0]->order)                                                    } },
@@ -116,16 +117,49 @@ 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 = <<SQL;
+    SELECT oi.id, doi.qty, doi.qty, doi.unit, doe.delivered
+    FROM record_links rl
+    INNER JOIN delivery_order_items doi ON (doi.delivery_order_id = rl.to_id)
+    INNER JOIN delivery_orders doe ON (doe.id = rl.to_id)
+    INNER JOIN orderitems oi ON (oi.trans_id = rl.from_id)
+    WHERE rl.from_table = 'oe'
+      AND rl.to_table   = 'delivery_orders'
+      AND oi.parts_id   = doi.parts_id
+      AND oi.id IN (@{[ join ', ', ("?")x @$orderitems ]})
+SQL
+
+  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 make_filter_summary {
   my ($self) = @_;
   my $vc     = $self->vc;
   my $mode   = $self->mode;
+  my ($business, $employee);
 
   my $filter = $::form->{filter} || {};
   my @filter_strings;
 
-  my $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"};
-  my $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id};
+  $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};
 
   my @filters = (
     [ $filter->{order}{"ordnumber:substr::ilike"},                    $::locale->text('Number')                                             ],
@@ -306,6 +340,9 @@ sub init_mode {
 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 link_to {
   my ($self, $object, %params) = @_;