X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=0e143192ea77510cf1df51f47bac52923e85682c;hb=2df28e2b27d5cf670da85c6cf8e91fab31874f80;hp=469d36592bf4b60561e05a70e71eebc9fd58bc08;hpb=5f7cab519820f9d5d7bbad3ba32271ef9995d78e;p=kivitendo-erp.git diff --git a/SL/DO.pm b/SL/DO.pm index 469d36592..0e143192e 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -33,6 +33,7 @@ package DO; +use Carp; use List::Util qw(max); use YAML; @@ -46,6 +47,8 @@ use SL::HTML::Restrict; use SL::RecordLinks; use SL::IC; use SL::TransNumber; +use SL::DB; +use SL::Util qw(trim); use strict; @@ -67,9 +70,10 @@ sub transactions { my $query = qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.cusordnumber, dord.transdate, dord.reqdate, - ct.${vc}number, ct.name, dord.${vc}_id, dord.globalproject_id, + ct.${vc}number, ct.name, ct.business_id, + dord.${vc}_id, dord.globalproject_id, dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia, - dord.transaction_description, + dord.transaction_description, dord.itime::DATE AS insertdate, pr.projectnumber AS globalprojectnumber, dep.description AS department, e.name AS employee, @@ -98,18 +102,23 @@ sub transactions { push @values, conv_i($form->{project_id}), conv_i($form->{project_id}); } + if ($form->{"business_id"}) { + push @where, qq|ct.business_id = ?|; + push @values, conv_i($form->{"business_id"}); + } + if ($form->{"${vc}_id"}) { push @where, qq|dord.${vc}_id = ?|; push @values, $form->{"${vc}_id"}; } elsif ($form->{$vc}) { push @where, qq|ct.name ILIKE ?|; - push @values, '%' . $form->{$vc} . '%'; + push @values, like($form->{$vc}); } if ($form->{"cp_name"}) { push @where, "(cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)"; - push @values, ('%' . $form->{"cp_name"} . '%')x2; + push @values, (like($form->{"cp_name"}))x2; } foreach my $item (qw(employee_id salesman_id)) { @@ -119,13 +128,13 @@ sub transactions { } if (!$main::auth->assert('sales_all_edit', 1)) { push @where, qq|dord.employee_id = (select id from employee where login= ?)|; - push @values, $form->{login}; + push @values, $::myconfig{login}; } foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) { next unless ($form->{$item}); push @where, qq|dord.$item ILIKE ?|; - push @values, '%' . $form->{$item} . '%'; + push @values, like($form->{$item}); } if (($form->{open} || $form->{closed}) && @@ -140,7 +149,7 @@ sub transactions { if ($form->{serialnumber}) { push @where, 'dord.id IN (SELECT doi.delivery_order_id FROM delivery_order_items doi WHERE doi.serialnumber LIKE ?)'; - push @values, '%' . $form->{serialnumber} . '%'; + push @values, like($form->{serialnumber}); } if($form->{transdatefrom}) { @@ -163,6 +172,43 @@ sub transactions { push @values, conv_date($form->{reqdateto}); } + if($form->{insertdatefrom}) { + push @where, qq|dord.itime::DATE >= ?|; + push@values, conv_date($form->{insertdatefrom}); + } + + if($form->{insertdateto}) { + push @where, qq|dord.itime::DATE <= ?|; + push @values, conv_date($form->{insertdateto}); + } + + if ($form->{parts_partnumber}) { + push @where, <{parts_partnumber}); + } + + if ($form->{parts_description}) { + push @where, <{parts_description}); + } + if (@where) { $query .= " WHERE " . join(" AND ", map { "($_)" } @where); } @@ -179,6 +225,7 @@ sub transactions { "shipvia" => "dord.shipvia", "transaction_description" => "dord.transaction_description", "department" => "lower(dep.description)", + "insertdate" => "dord.itime", ); my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; @@ -214,6 +261,16 @@ sub transactions { } sub save { + my ($self) = @_; + $main::lxdebug->enter_sub(); + + my $rc = SL::DB->client->with_transaction(\&_save, $self); + + $main::lxdebug->leave_sub(); + return $rc; +} + +sub _save { $main::lxdebug->enter_sub(); my ($self) = @_; @@ -221,8 +278,7 @@ sub save { my $myconfig = \%main::myconfig; my $form = $main::form; - # connect to database, turn off autocommit - my $dbh = $form->get_standard_dbh($myconfig); + my $dbh = SL::DB->client->dbh; my $restricter = SL::HTML::Restrict->create; my ($query, @values, $sth, $null); @@ -245,6 +301,11 @@ sub save { if ($form->{id}) { # only delete shipto complete + $query = qq|DELETE FROM custom_variables + WHERE (config_id IN (SELECT id FROM custom_variable_configs WHERE (module = 'ShipTo'))) + AND (trans_id IN (SELECT shipto_id FROM shipto WHERE (module = 'DO') AND (trans_id = ?)))|; + do_query($form, $dbh, $query, $form->{id}); + $query = qq|DELETE FROM shipto WHERE trans_id = ? AND module = 'DO'|; do_query($form, $dbh, $query, conv_i($form->{id})); @@ -261,7 +322,7 @@ sub save { my $items_reqdate; $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS'); - my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} }; + my %price_factors = map { $_->{id} => $_->{factor} *1 } @{ $form->{ALL_PRICE_FACTORS} }; my $price_factor; my %part_id_map = map { $_ => 1 } grep { $_ } map { $form->{"id_$_"} } (1 .. $form->{rowcount}); @@ -274,9 +335,8 @@ sub save { } my $q_item = <{rowcount}) { next if (!$form->{"id_$i"}); + CVar->get_non_editable_ic_cvars(form => $form, + dbh => $dbh, + row => $i, + sub_module => 'delivery_order_items', + may_converted_from => ['orderitems', 'delivery_order_items']); + + my $position = $i; + if (!$form->{"delivery_order_items_id_$i"}) { # there is no persistent id, therefore create one with all necessary constraints my $q_item_id = qq|SELECT nextval('delivery_order_items_id')|; my $h_item_id = prepare_query($form, $dbh, $q_item_id); do_statement($form, $h_item_id, $q_item_id); $form->{"delivery_order_items_id_$i"} = $h_item_id->fetchrow_array(); - $query = qq|INSERT INTO delivery_order_items (id, delivery_order_id, parts_id) VALUES (?, ?, ?)|; + $query = qq|INSERT INTO delivery_order_items (id, delivery_order_id, position, parts_id) VALUES (?, ?, ?, ?)|; do_query($form, $dbh, $query, conv_i($form->{"delivery_order_items_id_$i"}), - conv_i($form->{"id"}), conv_i($form->{"id_$i"})); + conv_i($form->{"id"}), conv_i($position), conv_i($form->{"id_$i"})); $h_item_id->finish(); } + $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"}); my $item_unit = $part_unit_map{$form->{"id_$i"}}; @@ -336,14 +405,12 @@ SQL $pricegroup_id = undef if !$pricegroup_id; # save detail record in delivery_order_items table - @values = (conv_i($form->{id}), conv_i($form->{"id_$i"}), + @values = (conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}), $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}), $form->{"qty_$i"}, $baseqty, $form->{"sellprice_$i"}, $form->{"discount_$i"} / 100, $form->{"unit_$i"}, conv_date($items_reqdate), conv_i($form->{"project_id_$i"}), $form->{"serialnumber_$i"}, - $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}), - $form->{"cusordnumber_$i"}, $form->{"lastcost_$i"}, conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"marge_price_factor_$i"}), @@ -367,7 +434,9 @@ SQL do_query($form, $dbh, $query, conv_i($sinfo->{"delivery_order_items_stock_id"}), conv_i($form->{"delivery_order_items_id_$i"}), $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}), conv_i($sinfo->{bin_id})); - $h_item_stock_id->finish(); + $h_item_stock_id->finish(); + # write back the id to the form (important if only transfer was clicked (id fk for invoice) + $form->{"stock_${in_out}_$i"} = YAML::Dump($stock_info); } @values = ($form->{"delivery_order_items_id_$i"}, $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}), conv_i($sinfo->{bin_id}), $sinfo->{chargenumber}, conv_date($sinfo->{bestbefore}), @@ -384,6 +453,18 @@ SQL name_prefix => 'ic_', name_postfix => "_$i", dbh => $dbh); + + # link order items with doi, for future extension look at foreach IS.pm + if (!$form->{saveasnew} && $form->{"converted_from_orderitems_id_$i"}) { + RecordLinks->create_links('dbh' => $dbh, + 'mode' => 'ids', + 'from_table' => 'orderitems', + 'from_ids' => $form->{"converted_from_orderitems_id_$i"}, + 'to_table' => 'delivery_order_items', + 'to_id' => $form->{"delivery_order_items_id_$i"}, + ); + } + delete $form->{"converted_from_orderitems_id_$i"}; } # 1. search for orphaned dois; processed_dois may be empty (no transfer) TODO: be supersafe and alter same statement for doi and oi @@ -420,7 +501,7 @@ SQL shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?, delivered = ?, department_id = ?, language_id = ?, shipto_id = ?, globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, - is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, currency_id = (SELECT id FROM currencies WHERE name = ?), + is_sales = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?), delivery_term_id = ? WHERE id = ?|; @@ -428,18 +509,20 @@ SQL $form->{cusordnumber}, conv_date($form->{transdate}), conv_i($form->{vendor_id}), conv_i($form->{customer_id}), conv_date($form->{reqdate}), $form->{shippingpoint}, $form->{shipvia}, - $form->{notes}, $form->{intnotes}, + $restricter->process($form->{notes}), $form->{intnotes}, $form->{closed} ? 't' : 'f', $form->{delivered} ? "t" : "f", conv_i($form->{department_id}), conv_i($form->{language_id}), conv_i($form->{shipto_id}), conv_i($form->{globalproject_id}), conv_i($form->{employee_id}), conv_i($form->{salesman_id}), conv_i($form->{cp_id}), $form->{transaction_description}, $form->{type} =~ /^sales/ ? 't' : 'f', - conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{currency}, + conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{payment_id}), $form->{currency}, conv_i($form->{delivery_term_id}), conv_i($form->{id})); do_query($form, $dbh, $query, @values); + $form->new_lastmtime('delivery_orders'); + $form->{name} = $form->{ $form->{vc} }; $form->{name} =~ s/--$form->{"$form->{vc}_id"}//; @@ -465,8 +548,6 @@ SQL 'type' => $form->{type} eq 'sales_delivery_order' ? 'sales' : 'purchase', 'dbh' => $dbh,); - my $rc = $dbh->commit(); - $form->{saved_donumber} = $form->{donumber}; $form->{saved_ordnumber} = $form->{ordnumber}; $form->{saved_cusordnumber} = $form->{cusordnumber}; @@ -475,7 +556,7 @@ SQL $main::lxdebug->leave_sub(); - return $rc; + return 1; } sub mark_orders_if_delivered { @@ -489,58 +570,15 @@ sub mark_orders_if_delivered { my $myconfig = \%main::myconfig; my $form = $main::form; - my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); - - my @links = RecordLinks->get_links('dbh' => $dbh, - 'from_table' => 'oe', - 'to_table' => 'delivery_orders', - 'to_id' => $params{do_id}); - - my $oe_id = @links ? $links[0]->{from_id} : undef; - - return $main::lxdebug->leave_sub() if (!$oe_id); - - my $all_units = AM->retrieve_all_units(); - - my $query = qq|SELECT oi.parts_id, oi.qty, oi.unit, p.unit AS partunit - FROM orderitems oi - LEFT JOIN parts p ON (oi.parts_id = p.id) - WHERE (oi.trans_id = ?)|; - my $sth = prepare_execute_query($form, $dbh, $query, $oe_id); - - my %shipped = $self->get_shipped_qty('type' => $params{type}, - 'oe_id' => $oe_id,); - my %ordered = (); - - while (my $ref = $sth->fetchrow_hashref()) { - $ref->{baseqty} = $ref->{qty} * $all_units->{$ref->{unit}}->{factor} / $all_units->{$ref->{partunit}}->{factor}; - - if ($ordered{$ref->{parts_id}}) { - $ordered{$ref->{parts_id}}->{baseqty} += $ref->{baseqty}; - } else { - $ordered{$ref->{parts_id}} = $ref; - } - } - - $sth->finish(); + SL::DB->client->with_transaction(sub { + my $dbh = $params{dbh} || SL::DB->client->dbh; - map { $_->{baseqty} = $_->{qty} * $all_units->{$_->{unit}}->{factor} / $all_units->{$_->{partunit}}->{factor} } values %shipped; + my %ship = $self->get_shipped_qty('dbh' => $dbh, 'do_id' => $form->{id}, 'delivered' => 1); - my $delivered = 1; - foreach my $part (values %ordered) { - if (!$shipped{$part->{parts_id}} || ($shipped{$part->{parts_id}}->{baseqty} < $part->{baseqty})) { - $delivered = 0; - last; + foreach my $oe_id (keys %ship) { + do_query($form, $dbh,"UPDATE oe SET delivered = ".($ship{$oe_id}->{delivered}?"TRUE":"FALSE")." WHERE id = ?", $oe_id); } - } - - if ($delivered) { - $query = qq|UPDATE oe - SET delivered = TRUE - WHERE id = ?|; - do_query($form, $dbh, $query, $oe_id); - $dbh->commit() if (!$params{dbh}); - } + }); $main::lxdebug->leave_sub(); } @@ -561,13 +599,15 @@ sub close_orders { my $myconfig = \%main::myconfig; my $form = $main::form; - my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); + SL::DB->client->with_transaction(sub { + my $dbh = $params{dbh} || SL::DB->client->dbh; - my $query = qq|UPDATE delivery_orders SET closed = TRUE WHERE id IN (| . join(', ', ('?') x scalar(@{ $params{ids} })) . qq|)|; + my $query = qq|UPDATE delivery_orders SET closed = TRUE WHERE id IN (| . join(', ', ('?') x scalar(@{ $params{ids} })) . qq|)|; - do_query($form, $dbh, $query, map { conv_i($_) } @{ $params{ids} }); + do_query($form, $dbh, $query, map { conv_i($_) } @{ $params{ids} }); + }); - $dbh->commit() unless ($params{dbh}); + $form->new_lastmtime('delivery_orders'); $main::lxdebug->leave_sub(); } @@ -648,9 +688,10 @@ sub retrieve { dord.closed, dord.reqdate, dord.department_id, dord.cusordnumber, d.description AS department, dord.language_id, dord.shipto_id, + dord.itime, dord.mtime, dord.globalproject_id, dord.delivered, dord.transaction_description, - dord.taxzone_id, dord.taxincluded, dord.terms, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency, - dord.delivery_term_id + dord.taxzone_id, dord.taxincluded, dord.payment_id, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency, + dord.delivery_term_id, dord.itime::DATE AS insertdate FROM delivery_orders dord JOIN ${vc} cv ON (dord.${vc}_id = cv.id) LEFT JOIN employee e ON (dord.employee_id = e.id) @@ -682,7 +723,8 @@ sub retrieve { } } $sth->finish(); - + $form->{mtime} ||= $form->{itime}; + $form->{lastmtime} = $form->{mtime}; $form->{donumber_array} =~ s/\s*$//g; $form->{ordnumber_array} =~ s/ //; $form->{ordnumber_array} =~ s/\s*$//g; @@ -705,6 +747,15 @@ sub retrieve { map { $form->{$_} = $ref->{$_} } keys %$ref; $sth->finish(); + if ($form->{shipto_id}) { + my $cvars = CVar->get_custom_variables( + dbh => $dbh, + module => 'ShipTo', + trans_id => $form->{shipto_id}, + ); + $form->{"shiptocvar_$_->{name}"} = $_->{value} for @{ $cvars }; + } + # get printed, emailed and queued $query = qq|SELECT s.printed, s.emailed, s.spoolfile, s.formname FROM status s WHERE s.trans_id = ?|; $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id})); @@ -740,7 +791,7 @@ sub retrieve { LEFT JOIN project pr ON (doi.project_id = pr.id) LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) WHERE doi.delivery_order_id IN ($do_ids_placeholders) - ORDER BY doi.oid|; + ORDER BY doi.delivery_order_id, doi.position|; $form->{form_details} = selectall_hashref_query($form, $dbh, $query, @do_ids); @@ -852,24 +903,28 @@ sub order_details { my $ic_cvar_configs = CVar->get_configs(module => 'IC'); my $project_cvar_configs = CVar->get_configs(module => 'Projects'); + # get some values of parts from db on store them in extra array, + # so that they can be sorted in later + my %prepared_template_arrays = IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form); + my @prepared_arrays = keys %prepared_template_arrays; + $form->{TEMPLATE_ARRAYS} = { }; - IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form); my @arrays = - qw(runningnumber number description longdescription qty unit + qw(runningnumber number description longdescription qty qty_nofmt unit partnotes serialnumber reqdate projectnumber projectdescription - weight lineweight + weight weight_nofmt lineweight lineweight_nofmt si_runningnumber si_number si_description si_warehouse si_bin si_chargenumber si_bestbefore si_qty si_qty_nofmt si_unit); - map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays); + map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays, @prepared_arrays); push @arrays, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; push @arrays, map { "project_cvar_$_->{name}" } @{ $project_cvar_configs }; $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS'); - my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} }; + my %price_factors = map { $_->{id} => $_->{factor} *1 } @{ $form->{ALL_PRICE_FACTORS} }; my $totalweight = 0; my $sameitem = ""; @@ -879,10 +934,13 @@ sub order_details { next if (!$form->{"id_$i"}); if ($item->[1] ne $sameitem) { - push(@{ $form->{description} }, qq|$item->[1]|); + push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type} }, 'partsgroup'); + push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, qq|$item->[1]|); $sameitem = $item->[1]; - map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays)); + map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} (@arrays, @prepared_arrays))); + map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays)); + $si_position++; } $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"}); @@ -907,6 +965,9 @@ sub order_details { my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || { 'factor' => 1 }; my $project = $projects_by_id{$form->{"project_id_$i"}} || SL::DB::Project->new; + push(@{ $form->{TEMPLATE_ARRAYS}{$_} }, $prepared_template_arrays{$_}[$i - 1]) for @prepared_arrays; + + push @{ $form->{TEMPLATE_ARRAYS}{entry_type} }, 'normal'; push @{ $form->{TEMPLATE_ARRAYS}{runningnumber} }, $position; push @{ $form->{TEMPLATE_ARRAYS}{number} }, $form->{"partnumber_$i"}; push @{ $form->{TEMPLATE_ARRAYS}{description} }, $form->{"description_$i"}; @@ -967,20 +1028,28 @@ sub order_details { while (my $ref = $h_pg->fetchrow_hashref("NAME_lc")) { if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) { - map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} @arrays)); + map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} (@arrays, @prepared_arrays))); map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays)); $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--"; + push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type} }, 'assembly-item-partsgroup'); push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, $sameitem); $si_position++; } - push(@{ $form->{TEMPLATE_ARRAYS}->{"description"} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq| -- $ref->{partnumber}, $ref->{description}|); - map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} @arrays)); + push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type} }, 'assembly-item'); + push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq| -- $ref->{partnumber}, $ref->{description}|); + map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} (@arrays, @prepared_arrays))); map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays)); $si_position++; } } + CVar->get_non_editable_ic_cvars(form => $form, + dbh => $dbh, + row => $i, + sub_module => 'delivery_order_items', + may_converted_from => ['orderitems', 'delivery_order_items']); + push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} }, CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_) for @{ $ic_cvar_configs }; @@ -996,6 +1065,7 @@ sub order_details { $h_pg->finish(); $h_bin_wh->finish(); + $form->{department} = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id}; $form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef); $form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id}; @@ -1147,17 +1217,19 @@ sub transfer_in_out { foreach my $request (@{ $params{requests} }) { push @transfers, { - 'parts_id' => $request->{parts_id}, - "${prefix}_warehouse_id" => $request->{warehouse_id}, - "${prefix}_bin_id" => $request->{bin_id}, - 'chargenumber' => $request->{chargenumber}, - 'bestbefore' => $request->{bestbefore}, - 'qty' => $request->{qty}, - 'unit' => $request->{unit}, - 'oe_id' => $form->{id}, - 'shippingdate' => 'current_date', - 'transfer_type' => $params{direction} eq 'in' ? 'stock' : 'shipped', - 'project_id' => $request->{project_id}, + 'parts_id' => $request->{parts_id}, + "${prefix}_warehouse_id" => $request->{warehouse_id}, + "${prefix}_bin_id" => $request->{bin_id}, + 'chargenumber' => $request->{chargenumber}, + 'bestbefore' => $request->{bestbefore}, + 'qty' => $request->{qty}, + 'unit' => $request->{unit}, + 'oe_id' => $form->{id}, + 'shippingdate' => 'current_date', + 'transfer_type' => $params{direction} eq 'in' ? 'stock' : 'shipped', + 'project_id' => $request->{project_id}, + 'delivery_order_items_stock_id' => $request->{delivery_order_items_stock_id}, + 'comment' => $request->{comment}, }; } @@ -1166,53 +1238,163 @@ sub transfer_in_out { $main::lxdebug->leave_sub(); } + sub get_shipped_qty { $main::lxdebug->enter_sub(); + # Drei Fälle: + # $params{oe_id} : Alle Lieferscheine zu diesem Auftrag durchsuchen und pro Auftragsposition die Mengen zurückgeben + # Wird zur Darstellung der gelieferten Mengen im Auftrag benötigt + # $params{do_id} : Alle Aufträge zu diesem Lieferschein durchsuchen und pro Lieferscheinposition die Mengen zurückgeben + # Wird für LaTeX benötigt um im Lieferschein pro Position die Mengen auszugeben + # $params{delivered}: Alle Aufträge zum Lieferschein $params{do_id} prüfen ob sie vollständiger ausgeliefert sind + # Wird für das Setzen des 'delivered' Flag in der Datenbank beim "save" des Lieferscheins benötigt + my $self = shift; my %params = @_; - Common::check_params(\%params, qw(type oe_id)); + # Eigentlich unkritisch: wenn keine der Parameter gesetzt ist kommt ein leerer Hash zurück + croak ("Need at least one parameter oe_id or do_id") unless $params{oe_id} || $params{do_id}; my $myconfig = \%main::myconfig; my $form = $main::form; - my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); + my %ship = (); - my @links = RecordLinks->get_links('dbh' => $dbh, - 'from_table' => 'oe', - 'from_id' => $params{oe_id}, - 'to_table' => 'delivery_orders'); - my @values = map { $_->{to_id} } @links; + my @oe_ids; - if (!scalar @values) { - $main::lxdebug->leave_sub(); - return (); + if ($params{oe_id} ) { + push @oe_ids, $params{oe_id}; + } elsif ($params{do_id}) { + my @links = RecordLinks->get_links( 'dbh' => $dbh, + 'from_table' => 'oe', + 'to_table' => 'delivery_orders', + 'to_id' => $params{do_id}); + + @oe_ids = map { $_->{from_id} } @links; } - my $query = - qq|SELECT doi.parts_id, doi.qty, doi.unit, p.unit AS partunit - FROM delivery_order_items doi - LEFT JOIN delivery_orders o ON (doi.delivery_order_id = o.id) - LEFT JOIN parts p ON (doi.parts_id = p.id) - WHERE o.id IN (| . join(', ', ('?') x scalar @values) . qq|)|; + if (scalar (@oe_ids) > 0 ) { + my $all_units = AM->retrieve_all_units(); + my $placeholders = join(', ', ('?') x scalar @oe_ids); + my $query = qq|SELECT oi.id, oi.position, oi.parts_id, oi.qty, oi.unit, oi.trans_id, + p.unit AS partunit FROM orderitems oi + LEFT JOIN parts p ON (oi.parts_id = p.id) + WHERE trans_id IN (${placeholders}) + ORDER BY position ASC|; + + my $orderitems = selectall_hashref_query($form, $dbh, $query, @oe_ids); + foreach my $oe_entry (@{ $orderitems }) { + $oe_entry->{qty} *= AM->convert_unit($oe_entry->{unit}, $oe_entry->{partunit}, $all_units); + $oe_entry->{qty_notdelivered} = $oe_entry->{qty}; + + # Bei oe Modus auf jeden Fall einen Record anlegen + if ( $params{oe_id} ) { + $ship{$oe_entry->{position}} = { + 'qty_ordered' => $oe_entry->{qty} , + 'qty_notdelivered' => $oe_entry->{qty} + }; + } + } - my %ship = (); - my $entries = selectall_hashref_query($form, $dbh, $query, @values); - my $all_units = AM->retrieve_all_units(); + my @dolinks = RecordLinks->get_links('dbh' => $dbh, + 'from_table' => 'oe', + 'to_table' => 'delivery_orders', + 'from_id' => @oe_ids); - foreach my $entry (@{ $entries }) { - $entry->{qty} *= AM->convert_unit($entry->{unit}, $entry->{partunit}, $all_units); + my @do_ids = map { $_->{to_id} } @dolinks ; + if (scalar (@do_ids) == 0) { + $main::lxdebug->leave_sub(); + return %ship; + } - if (!$ship{$entry->{parts_id}}) { - $ship{$entry->{parts_id}} = $entry; - } else { - $ship{$entry->{parts_id}}->{qty} += $entry->{qty}; + my %oeitems_by_id = map { $_->{id} => $_ } @{ $orderitems }; + + + $placeholders = join(', ', ('?') x scalar @do_ids); + $query = qq|SELECT doi.parts_id, doi.id, doi.qty, doi.unit, doi.position, + doi.delivery_order_id, COALESCE(rlitem.from_id,0) as from_id, + p.unit AS partunit + FROM delivery_order_items doi + LEFT JOIN parts p ON (doi.parts_id = p.id) + LEFT JOIN record_links rlitem + ON (rlitem.to_id = doi.id AND rlitem.to_table='delivery_order_items') + WHERE doi.delivery_order_id IN (${placeholders})|; + + my $deliveryorderitems = selectall_hashref_query($form, $dbh, $query, @do_ids); + + # erst mal qty der links bearbeiten + foreach my $do_entry (@{ $deliveryorderitems }) { + $do_entry->{qty} *= AM->convert_unit($do_entry->{unit}, $do_entry->{partunit}, $all_units); + if ($do_entry->{from_id} > 0 ) { + # record link zwischen items vorhanden, kann auch von anderem Auftrag sein + my $oe_entry = $oeitems_by_id{$do_entry->{from_id}}; + if ( $oe_entry ) { + $oe_entry->{qty_notdelivered} -= $do_entry->{qty}; + # derzeit nur ein link pro do_item + $do_entry->{oe_entry} = $oe_entry; + } + } else { + $main::lxdebug->message(LXDebug->DEBUG2(),"no entry for=".$do_entry->{id}." part=".$do_entry->{parts_id}); + } + } + # nun den rest ohne links bearbeiten + foreach my $do_entry (@{ $deliveryorderitems }) { + next if $do_entry->{from_id} > 0; + next if $do_entry->{qty} == 0; + + foreach my $oe_entry (@{ $orderitems }) { + next if $oe_entry->{qty_notdelivered} == 0; + if ( $do_entry->{parts_id} == $oe_entry->{parts_id} ) { + # zu viele geliefert auf andere position ? + if ( $oe_entry->{qty_notdelivered} < 0 ) { + $do_entry->{qty} += - $oe_entry->{qty_notdelivered}; + $oe_entry->{qty_notdelivered} = 0; + } else { + if ( $do_entry->{qty} < $oe_entry->{qty_notdelivered} ) { + $oe_entry->{qty_notdelivered} -= $do_entry->{qty}; + $do_entry->{qty} = 0; + } else { + $do_entry->{qty} -= $oe_entry->{qty_notdelivered}; + $oe_entry->{qty_notdelivered} = 0; + } + # derzeit nur ein link pro do_item + $do_entry->{oe_entry} = $oe_entry if !$do_entry->{oe_entry}; + } + } + last if $do_entry->{qty} <= 0; + } + } + if ( $params{oe_id} ) { + $ship{$_->{position}}->{qty_notdelivered} = $_->{qty_notdelivered} for @{ $orderitems }; + } + elsif ($params{do_id} && $params{delivered}) { + foreach my $oe_entry (@{ $orderitems }) { + if ( !$ship{$oe_entry->{trans_id}} ) { + $ship{$oe_entry->{trans_id}} = { 'delivered' => 1 }; + } + $ship{$oe_entry->{trans_id}}->{delivered} = 0 if $oe_entry->{qty_notdelivered} > 0; + } + } + elsif ($params{do_id}) { + foreach my $do_entry (@{ $deliveryorderitems }) { + next if $params{do_id} != $do_entry->{delivery_order_id}; + my $position = $do_entry->{position}; + if ( $position > 0 && $do_entry->{oe_entry}) { + if ( !$ship{$position} ) { + $ship{$position} = { + 'qty_ordered' => $do_entry->{oe_entry}->{qty} , + 'qty_notdelivered' => $do_entry->{oe_entry}->{qty_notdelivered} + }; + } else { + $ship{$position}->{qty_ordered} += $do_entry->{oe_entry}->{qty}; + $ship{$position}->{qty_notdelivered} += $do_entry->{oe_entry}->{qty_notdelivered}; + } + } + } } } - $main::lxdebug->leave_sub(); - return %ship; } @@ -1236,5 +1418,4 @@ sub is_marked_as_delivered { return $delivered ? 1 : 0; } - 1;