X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FWH.pm;h=28e836e485cd22b3a7018b93182b004025c2678f;hb=0f179c9ab60ac22c697027cadc9f4bdb9c515ce5;hp=c4ec2a6382c383b8ede6a9b3ce925e0a16ead137;hpb=0ffc7ab07f73a0645ae7dd338c11270acc874c62;p=kivitendo-erp.git diff --git a/SL/WH.pm b/SL/WH.pm index c4ec2a638..28e836e48 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -55,63 +55,94 @@ sub transfer { require SL::DB::Part; require SL::DB::Employee; require SL::DB::Inventory; + my $employee = SL::DB::Manager::Employee->find_by(login => $::form->{login}); my ($now) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT current_date|); my @directions = (undef, qw(out in transfer)); - my $db = SL::DB->create(undef, 'LXOFFICE'); - - for my $transfer (@args) { - my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|); - - my $direction = 0; - $direction |= 1 if ($transfer->{src_warehouse_id} && $transfer->{src_bin_id}); - $direction |= 2 if ($transfer->{dst_warehouse_id} && $transfer->{dst_bin_id}); - - $transfer->{trans_type_id} = $transfer->{transfer_type_id} || SL::DB::Manager::TransferType->find_by( - direction => $directions[$direction], - description => $transfer->{transfer_type}, - )->id; - - my %params = ( - shippingdate => !$transfer->{shippingdate} || $transfer->{shippingdate} eq 'current_date' ? $now : $transfer->{shippingdate}, - employee => $employee, - trans_id => $trans_id, - map { $_ => $transfer->{$_} } qw( - parts_id chargenumber bestbefore oe_id orderitems_id project_id comment trans_type_id), - ); - my $qty = $transfer->{qty}; + my $objectify = sub { + my ($transfer, $field, $class, @find_by) = @_; - if ($transfer->{unit}) { - my $part = SL::DB::Manager::Part->find_by(id => $transfer->{parts_id}); - my $transfer_unit = SL::DB::Manager::Unit->find_by(name => $transfer->{unit}); + @find_by = (description => $transfer->{$field}) unless @find_by; - $qty *= $transfer_unit->factor; - $qty /= $part->unit_obj->factor || 1 if $part->unit; + if ($transfer->{$field} || $transfer->{"${field}_id"}) { + return ref $transfer->{$field} && $transfer->{$field}->isa($class) ? $transfer->{$field} + : $transfer->{$field} ? $class->_get_manager_class->find_by(@find_by) + : $class->_get_manager_class->find_by(id => $transfer->{"${field}_id"}); } + return; + }; + + my @trans_ids; + + my $db = SL::DB::Inventory->new->db; + $db->do_transaction(sub{ + while (my $transfer = shift @args) { + my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|); + + my $part = $objectify->($transfer, 'parts', 'SL::DB::Part'); + my $unit = $objectify->($transfer, 'unit', 'SL::DB::Unit', name => $transfer->{unit}); + my $qty = $transfer->{qty}; + my $src_bin = $objectify->($transfer, 'src_bin', 'SL::DB::Bin'); + my $dst_bin = $objectify->($transfer, 'dst_bin', 'SL::DB::Bin'); + my $src_wh = $objectify->($transfer, 'src_warehouse', 'SL::DB::Warehouse'); + my $dst_wh = $objectify->($transfer, 'dst_warehouse', 'SL::DB::Warehouse'); + my $project = $objectify->($transfer, 'project', 'SL::DB::Project'); + + $src_wh ||= $src_bin->warehouse if $src_bin; + $dst_wh ||= $dst_bin->warehouse if $dst_bin; + + my $direction = 0; # bit mask + $direction |= 1 if $src_bin; + $direction |= 2 if $dst_bin; + + my $transfer_type = $objectify->($transfer, 'transfer_type', 'SL::DB::TransferType', direction => $directions[$direction], + description => $transfer->{transfer_type}); + + my %params = ( + part => $part, + employee => $employee, + trans_type => $transfer_type, + project => $project, + trans_id => $trans_id, + shippingdate => !$transfer->{shippingdate} || $transfer->{shippingdate} eq 'current_date' + ? $now : $transfer->{shippingdate}, + map { $_ => $transfer->{$_} } qw( chargenumber bestbefore oe_id orderitems_id comment), + ); + + if ($unit) { + $qty = $unit->convert_to($qty, $part->unit_obj); + } - if ($direction & 1) { - SL::DB::Inventory->new( - %params, - warehouse_id => $transfer->{src_warehouse_id}, - bin_id => $transfer->{src_bin_id}, - qty => $qty * -1 - )->save; - } + $params{chargenumber} ||= ''; - if ($direction & 2) { - SL::DB::Inventory->new( - %params, - warehouse_id => $transfer->{dst_warehouse_id}, - bin_id => $transfer->{dst_bin_id}, - qty => $qty - )->save; - } - } + if ($direction & 1) { + SL::DB::Inventory->new( + %params, + warehouse => $src_wh, + bin => $src_bin, + qty => $qty * -1, + )->save; + } - $db->commit; + if ($direction & 2) { + SL::DB::Inventory->new( + %params, + warehouse => $dst_wh->id, + bin => $dst_bin->id, + qty => $qty, + )->save; + } + + push @trans_ids, $trans_id; + } + }) or do { + $::form->error("Warehouse transfer error: " . join("\n", (split(/\n/, $db->error))[0..2])); + }; $::lxdebug->leave_sub; + + return @trans_ids; } sub transfer_assembly { @@ -590,6 +621,14 @@ sub get_warehouse_report { push @filter_vars, '%' . $filter{ean} . '%'; } + if ($filter{date}) { + push @filter_ary, "i.itime <= ?"; + push @filter_vars, $filter{date}; + } + if (!$filter{include_invalid_warehouses}){ + push @filter_ary, "NOT (w.invalid)"; + } + # prepare qty comparison for later filtering my ($f_qty_op, $f_qty, $f_qty_base_unit); @@ -871,4 +910,122 @@ $main::lxdebug->enter_sub(); } +1; + +__END__ + +=head1 NAME + +SL::WH - Warehouse backend + +=head1 SYNOPSIS + + use SL::WH; + WH->transfer(\%params); + +=head1 DESCRIPTION + +Backend for lx-office warehousing functions. + +=head1 FUNCTIONS + +=head2 transfer \%PARAMS, [ \%PARAMS, ... ] + +This is the main function to manipulate warehouse contents. A typical transfer +is called like this: + + WH->transfer->({ + parts_id => 6342, + qty => 12.45, + transfer_type => 'transfer', + src_warehouse_id => 12, + stc_bin_id => 23, + dst_warehouse_id => 25, + dst_bin_id => 167, + }); + +It will generate an entry in inventory representing the transfer. Note that +parts_id, qty, and transfer_type are mandatory. Depending on the transfer_type +a destination or a src is mandatory. + +transfer accepts more than one transaction parameter, each being a hash ref. If +more than one is supplied, it is guaranteed, that all are processed in the same +transaction. + +Here is a full list of parameters. All "_id" parameters except oe and +orderitems can be called without id with RDB objects as well. + +=over 4 + +=item parts_id + +The id of the article transferred. Does not check if the article is a service. +Mandatory. + +=item qty + +Quantity of the transaction. Mandatory. + +=item unit + +Unit of the transaction. Optional. + +=item transfer_type + +=item transfer_type_id + +The type of transaction. The first version is a string describing the +transaction (the types 'transfer' 'in' 'out' and a few others are present on +every system), the id is the hard id of a transfer_type from the database. + +Depending of the direction of the transfer_type, source and/or destination must +be specified. + +One of transfer_type or transfer_type_id is mandatory. + +=item src_warehouse_id + +=item src_bin_id + +Warehouse and bin from which to transfer. Mandatory in transfer and out +directions. Ignored in in directions. + +=item dst_warehouse_id + +=item dst_bin_id + +Warehouse and bin to which to transfer. Mandatory in transfer and in +directions. Ignored in out directions. + +=item chargenumber + +If given, the transfer will transfer only articles with this chargenumber. +Optional. + +=item orderitem_id + +Reference to an orderitem for which this transfer happened. Optional + +=item oe_id + +Reference to an order for which this transfer happened. Optional + +=item comment + +An optional comment. + +=item best_before + +An expiration date. Note that this is not by default used by C. + +=back + +=head1 BUGS + +None yet. + +=head1 AUTHOR + +=cut + 1;