X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FWH.pm;fp=SL%2FWH.pm;h=52e174ff0bfe3c4ed6a3e564d6b54fc312e5af7b;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=8ff63f219c8c1958de068049522de3c1eb090478;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;p=kivitendo-erp.git diff --git a/SL/WH.pm b/SL/WH.pm index 8ff63f219..52e174ff0 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -25,7 +25,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # Warehouse module @@ -34,12 +35,14 @@ package WH; +use Carp qw(croak); + use SL::AM; use SL::DBUtils; +use SL::DB::Inventory; use SL::Form; - -use SL::DB::Unit; -use SL::DB::Assembly; +use SL::Locale::String qw(t8); +use SL::Util qw(trim); use warnings; use strict; @@ -57,9 +60,8 @@ sub transfer { require SL::DB::TransferType; require SL::DB::Part; require SL::DB::Employee; - require SL::DB::Inventory; - my $employee = SL::DB::Manager::Employee->find_by(login => $::myconfig{login}); + my $employee = SL::DB::Manager::Employee->current; my ($now) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT current_date|); my @directions = (undef, qw(out in transfer)); @@ -81,7 +83,8 @@ sub transfer { my $db = SL::DB::Inventory->new->db; $db->with_transaction(sub{ while (my $transfer = shift @args) { - my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|); + my $trans_id; + ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|) if $transfer->{qty}; my $part = $objectify->($transfer, 'parts', 'SL::DB::Part'); my $unit = $objectify->($transfer, 'unit', 'SL::DB::Unit', name => $transfer->{unit}); @@ -99,13 +102,21 @@ sub transfer { $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 $transfer_type_id; + if ($transfer->{transfer_type_id}) { + $transfer_type_id = $transfer->{transfer_type_id}; + } else { + my $transfer_type = $objectify->($transfer, 'transfer_type', 'SL::DB::TransferType', direction => $directions[$direction], + description => $transfer->{transfer_type}); + $transfer_type_id = $transfer_type->id; + } + + my $stocktaking_qty = $transfer->{stocktaking_qty}; my %params = ( part => $part, employee => $employee, - trans_type => $transfer_type, + trans_type_id => $transfer_type_id, project => $project, trans_id => $trans_id, shippingdate => !$transfer->{shippingdate} || $transfer->{shippingdate} eq 'current_date' @@ -114,13 +125,15 @@ sub transfer { ); if ($unit) { - $qty = $unit->convert_to($qty, $part->unit_obj); + $qty = $unit->convert_to($qty, $part->unit_obj); + $stocktaking_qty = $unit->convert_to($stocktaking_qty, $part->unit_obj); } $params{chargenumber} ||= ''; - if ($direction & 1) { - SL::DB::Inventory->new( + my @inventories; + if ($qty && $direction & 1) { + push @inventories, SL::DB::Inventory->new( %params, warehouse => $src_wh, bin => $src_bin, @@ -128,8 +141,8 @@ sub transfer { )->save; } - if ($direction & 2) { - SL::DB::Inventory->new( + if ($qty && $direction & 2) { + push @inventories, SL::DB::Inventory->new( %params, warehouse => $dst_wh->id, bin => $dst_bin->id, @@ -141,6 +154,30 @@ sub transfer { } } + # Record stocktaking if requested. + # This is only possible if transfer was a stock in or stock out, + # but not both (transfer). + if ($transfer->{record_stocktaking}) { + die 'Stocktaking can only be recorded for stock in or stock out, but not on a transfer.' if scalar @inventories > 1; + + my $inventory_id; + $inventory_id = $inventories[0]->id if $inventories[0]; + + SL::DB::Stocktaking->new( + inventory_id => $inventory_id, + warehouse => $src_wh || $dst_wh, + bin => $src_bin || $dst_bin, + parts_id => $part->id, + employee_id => $employee->id, + qty => $stocktaking_qty, + comment => $transfer->{comment}, + cutoff_date => $transfer->{stocktaking_cutoff_date}, + chargenumber => $transfer->{chargenumber}, + bestbefore => $transfer->{bestbefore}, + )->save; + + } + push @trans_ids, $trans_id; } @@ -154,152 +191,6 @@ sub transfer { return @trans_ids; } -sub transfer_assembly { - $main::lxdebug->enter_sub(); - - my $self = shift; - my %params = @_; - Common::check_params(\%params, qw(assembly_id dst_warehouse_id login qty unit dst_bin_id chargenumber bestbefore comment)); - - - my $unit = SL::DB::Manager::Unit->find_by(name => $params{unit}); - if ($unit) { - my $assembly = SL::DB::Manager::Assembly->get_all( - query => [ id => $params{assembly_id} ], - with_objects => ['part'], - limit => 1, - )->[0]; - $params{qty} = $unit->convert_to($params{qty}, $assembly->part->unit_obj); - } - -# my $maxcreate=WH->check_assembly_max_create(assembly_id =>$params{'assembly_id'}, dbh => $my_dbh); - - my $myconfig = \%main::myconfig; - my $form = $main::form; - my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); - - - # Ablauferklärung - # - # ... Standard-Check oben Ende. Hier die eigentliche SQL-Abfrage - # select parts_id,qty from assembly where id=1064; - # Erweiterung für bug 935 am 23.4.09 - - # Erzeugnisse können Dienstleistungen enthalten, die ja nicht 'lagerbar' sind. - # select parts_id,qty from assembly inner join parts on assembly.parts_id = parts.id - # where assembly.id=1066 and inventory_accno_id IS NOT NULL; - # - # Erweiterung für bug 23.4.09 -2 Erzeugnisse in Erzeugnissen können nicht ausgelagert werden, - # wenn assembly nicht überprüft wird ... - # patch von joachim eingespielt 24.4.2009: - # my $query = qq|select parts_id,qty from assembly inner join parts - # on assembly.parts_id = parts.id where assembly.id = ? and - # (inventory_accno_id IS NOT NULL or parts.assembly = TRUE)|; - - - my $query = qq|select parts_id,qty from assembly inner join parts on assembly.parts_id = parts.id - where assembly.id = ? and (inventory_accno_id IS NOT NULL or parts.assembly = TRUE)|; - - my $sth_part_qty_assembly = prepare_execute_query($form, $dbh, $query, $params{assembly_id}); - - # Hier wird das prepared Statement für die Schleife über alle Lagerplätze vorbereitet - my $transferPartSQL = qq|INSERT INTO inventory (parts_id, warehouse_id, bin_id, chargenumber, bestbefore, comment, employee_id, qty, trans_id, trans_type_id) - VALUES (?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, nextval('id'), - (SELECT id FROM transfer_type WHERE direction = 'out' AND description = 'used'))|; - my $sthTransferPartSQL = prepare_query($form, $dbh, $transferPartSQL); - - # der return-string für die fehlermeldung inkl. welche waren zum fertigen noch fehlen - - my $kannNichtFertigen =""; # Falls leer dann erfolgreich - my $schleife_durchlaufen=0; # Falls die Schleife nicht ausgeführt wird -> Keine Einzelteile definiert. Bessere Idee? jan - while (my $hash_ref = $sth_part_qty_assembly->fetchrow_hashref()) { #Schleife für select parts_id,(...) from assembly - $schleife_durchlaufen=1; # Erzeugnis definiert - my $partsQTY = $hash_ref->{qty} * $params{qty}; # benötigte teile * anzahl erzeugnisse - my $currentPart_ID = $hash_ref->{parts_id}; - - # Überprüfen, ob diese Anzahl gefertigt werden kann - my $max_parts = $self->get_max_qty_parts(parts_id => $currentPart_ID, # $self->method() == this.method() - warehouse_id => $params{dst_warehouse_id}); - - if ($partsQTY > $max_parts){ - # Gibt es hier ein Problem mit nicht "escapten" Zeichen? - # 25.4.09 Antwort: Ja. Aber erst wenn im Frontend die locales-Funktion aufgerufen wird - - $kannNichtFertigen .= "Zum Fertigen fehlen:" . abs($partsQTY - $max_parts) . - " Einheiten der Ware:" . $self->get_part_description(parts_id => $currentPart_ID) . - ", um das Erzeugnis herzustellen.
"; # Konnte die Menge nicht mit der aktuellen Anzahl der Waren fertigen - next; # die weiteren Überprüfungen sind unnötig, daher das nächste elemente prüfen (genaue Ausgabe, was noch fehlt) - } - - # Eine kurze Vorabfrage, um den Lagerplatz, Chargennummer und die Mindesthaltbarkeit zu bestimmen - # Offen: Die Summe über alle Lagerplätze wird noch nicht gebildet - # Gelöst: Wir haben vorher schon die Abfrage durchgeführt, ob wir fertigen können. - # Noch besser gelöst: Wir laufen durch alle benötigten Waren zum Fertigen und geben eine Rückmeldung an den Benutzer was noch fehlt - # und lösen den Rest dann so wie bei xplace im Barcode-Programm - # S.a. Kommentar im bin/mozilla-Code mb übernimmt und macht das in ordentlich - - my $tempquery = qq|SELECT SUM(qty), bin_id, chargenumber, bestbefore FROM inventory - WHERE warehouse_id = ? AND parts_id = ? GROUP BY bin_id, chargenumber, bestbefore having SUM(qty)>0|; - my $tempsth = prepare_execute_query($form, $dbh, $tempquery, $params{dst_warehouse_id}, $currentPart_ID); - - # Alle Werte zu dem einzelnen Artikel, die wir später auslagern - my $tmpPartsQTY = $partsQTY; - - while (my $temphash_ref = $tempsth->fetchrow_hashref()) { - my $temppart_bin_id = $temphash_ref->{bin_id}; # kann man hier den quelllagerplatz beim verbauen angeben? - my $temppart_chargenumber = $temphash_ref->{chargenumber}; - my $temppart_bestbefore = conv_date($temphash_ref->{bestbefore}); - my $temppart_qty = $temphash_ref->{sum}; - - if ($tmpPartsQTY > $temppart_qty) { # wir haben noch mehr waren zum wegbuchen. - # Wir buchen den kompletten Lagerplatzbestand und zählen die Hilfsvariable runter - $tmpPartsQTY = $tmpPartsQTY - $temppart_qty; - $temppart_qty = $temppart_qty * -1; # TODO beim analyiseren des sql-trace, war dieser wert positiv, - # wenn * -1 als berechnung in der parameter-übergabe angegeben wird. - # Dieser Wert IST und BLEIBT positiv!! Hilfe. - # Liegt das daran, dass dieser Wert aus einem SQL-Statement stammt? - do_statement($form, $sthTransferPartSQL, $transferPartSQL, $currentPart_ID, $params{dst_warehouse_id}, - $temppart_bin_id, $temppart_chargenumber, $temppart_bestbefore, 'Verbraucht für ' . - $self->get_part_description(parts_id => $params{assembly_id}), $params{login}, $temppart_qty); - - # hier ist noch ein fehler am besten mit definierten erzeugnissen debuggen 02/2009 jb - # idee: ausbuch algorithmus mit rekursion lösen und an- und abschaltbar machen - # das problem könnte sein, dass strict nicht an war und sth global eine andere zuweisung bekam - # auf jeden fall war der internal-server-error nach aktivierung von strict und warnings plus ein paar my-definitionen weg - } else { # okay, wir haben weniger oder gleich Waren die wir wegbuchen müssen, wir können also aufhören - $tmpPartsQTY *=-1; - do_statement($form, $sthTransferPartSQL, $transferPartSQL, $currentPart_ID, $params{dst_warehouse_id}, - $temppart_bin_id, $temppart_chargenumber, $temppart_bestbefore, 'Verbraucht für ' . - $self->get_part_description(parts_id => $params{assembly_id}), $params{login}, $tmpPartsQTY); - last; # beendet die schleife (springt zum letzten element) - } - } # ende while SELECT SUM(qty), bin_id, chargenumber, bestbefore FROM inventory WHERE warehouse_id - } #ende while select parts_id,qty from assembly where id = ? - - if ($schleife_durchlaufen==0){ # falls die schleife nicht durchlaufen wurde, wurden auch - # keine einzelteile definiert - $kannNichtFertigen ="Für dieses Erzeugnis sind keine Einzelteile definiert. - Dementsprechend kann auch nichts hergestellt werden"; - } - # gibt die Fehlermeldung zurück. A.) Keine Teile definiert - # B.) Artikel und Anzahl der fehlenden Teile/Dienstleistungen - if ($kannNichtFertigen) { - return $kannNichtFertigen; - } - - # soweit alles gut. Jetzt noch die wirkliche Lagerbewegung für das Erzeugnis ausführen ... - my $transferAssemblySQL = qq|INSERT INTO inventory (parts_id, warehouse_id, bin_id, chargenumber, bestbefore, - comment, employee_id, qty, trans_id, trans_type_id) - VALUES (?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, nextval('id'), - (SELECT id FROM transfer_type WHERE direction = 'in' AND description = 'stock'))|; - my $sthTransferAssemblySQL = prepare_query($form, $dbh, $transferAssemblySQL); - do_statement($form, $sthTransferAssemblySQL, $transferAssemblySQL, $params{assembly_id}, $params{dst_warehouse_id}, - $params{dst_bin_id}, $params{chargenumber}, conv_date($params{bestbefore}), $params{comment}, $params{login}, $params{qty}); - $dbh->commit(); - - $main::lxdebug->leave_sub(); - return 1; # Alles erfolgreich -} - sub get_warehouse_journal { $main::lxdebug->enter_sub(); @@ -329,32 +220,37 @@ sub get_warehouse_journal { if ($filter{partnumber}) { push @filter_ary, "p.partnumber ILIKE ?"; - push @filter_vars, '%' . $filter{partnumber} . '%'; + push @filter_vars, like($filter{partnumber}); } if ($filter{description}) { push @filter_ary, "(p.description ILIKE ?)"; - push @filter_vars, '%' . $filter{description} . '%'; + push @filter_vars, like($filter{description}); + } + + if ($filter{classification_id}) { + push @filter_ary, "p.classification_id = ?"; + push @filter_vars, $filter{classification_id}; } if ($filter{chargenumber}) { push @filter_ary, "i1.chargenumber ILIKE ?"; - push @filter_vars, '%' . $filter{chargenumber} . '%'; + push @filter_vars, like($filter{chargenumber}); } - if ($form->{bestbefore}) { + if (trim($form->{bestbefore})) { push @filter_ary, "?::DATE = i1.bestbefore::DATE"; - push @filter_vars, $form->{bestbefore}; + push @filter_vars, trim($form->{bestbefore}); } - if ($form->{fromdate}) { - push @filter_ary, "?::DATE <= i1.itime::DATE"; - push @filter_vars, $form->{fromdate}; + if (trim($form->{fromdate})) { + push @filter_ary, "? <= i1.shippingdate"; + push @filter_vars, trim($form->{fromdate}); } - if ($form->{todate}) { - push @filter_ary, "?::DATE >= i1.itime::DATE"; - push @filter_vars, $form->{todate}; + if (trim($form->{todate})) { + push @filter_ary, "? >= i1.shippingdate"; + push @filter_vars, trim($form->{todate}); } if ($form->{l_employee}) { @@ -383,18 +279,52 @@ sub get_warehouse_journal { my $sort_order = $form->{order}; $sort_col = $filter{sort} unless $sort_col; - $sort_order = ($sort_col = 'itime') unless $sort_col; - $sort_col = 'itime' if $sort_col eq 'date'; - $sort_order = $filter{order} unless $sort_order; - my $sort_spec = "${sort_col} " . ($sort_order ? " DESC" : " ASC"); + $sort_col = 'shippingdate' if $sort_col eq 'date'; + $sort_order = ($sort_col = 'shippingdate') unless $sort_col; + + my %orderspecs = ( + 'shippingdate' => ['shippingdate', 'r_itime', 'r_parts_id'], + 'bin_to' => ['bin_to', 'r_itime', 'r_parts_id'], + 'bin_from' => ['bin_from', 'r_itime', 'r_parts_id'], + 'warehouse_to' => ['warehouse_to, r_itime, r_parts_id'], + 'warehouse_from' => ['warehouse_from, r_itime, r_parts_id'], + 'partnumber' => ['partnumber'], + 'partdescription'=> ['partdescription'], + 'partunit' => ['partunit, r_itime, r_parts_id'], + 'qty' => ['qty, r_itime, r_parts_id'], + 'oe_id' => ['oe_id'], + 'comment' => ['comment'], + 'trans_type' => ['trans_type'], + 'employee' => ['employee'], + 'projectnumber' => ['projectnumber'], + 'chargenumber' => ['chargenumber'], + ); + + $sort_order = $filter{order} unless $sort_order; + my $ASC = ($sort_order ? " DESC" : " ASC"); + my $sort_spec = join("$ASC , ", @{$orderspecs{$sort_col}}). " $ASC"; my $where_clause = @filter_ary ? join(" AND ", @filter_ary) . " AND " : ''; + my ($cvar_where, @cvar_values) = CVar->build_filter_query( + module => 'IC', + trans_id_field => 'p.id', + filter => $form, + sub_module => undef, + ); + + if ($cvar_where) { + $where_clause .= qq| ($cvar_where) AND |; + push @filter_vars, @cvar_values; + } + $select_tokens{'trans'} = { "parts_id" => "i1.parts_id", "qty" => "ABS(SUM(i1.qty))", "partnumber" => "p.partnumber", "partdescription" => "p.description", + "classification_id" => "p.classification_id", + "part_type" => "p.part_type", "bindescription" => "b.description", "chargenumber" => "i1.chargenumber", "bestbefore" => "i1.bestbefore", @@ -407,10 +337,12 @@ sub get_warehouse_journal { "comment" => "i1.comment", "trans_type" => "tt.description", "trans_id" => "i1.trans_id", + "id" => "i1.id", "oe_id" => "COALESCE(i1.oe_id, i2.oe_id)", "invoice_id" => "COALESCE(i1.invoice_id, i2.invoice_id)", - "date" => "i1.itime::DATE", + "date" => "i1.shippingdate", "itime" => "i1.itime", + "shippingdate" => "i1.shippingdate", "employee" => "e.name", "projectnumber" => "COALESCE(pr.projectnumber, '$filter{na}')", }; @@ -425,40 +357,29 @@ sub get_warehouse_journal { "warehouse_from" => "'$filter{na}'", }; + $form->{l_classification_id} = 'Y'; + $form->{l_trans_id} = 'Y'; + $form->{l_part_type} = 'Y'; + $form->{l_itime} = 'Y'; $form->{l_invoice_id} = $form->{l_oe_id} if $form->{l_oe_id}; # build the select clauses. # take all the requested ones from the first hash and overwrite them from the out/in hashes if present. for my $i ('trans', 'out', 'in') { $select{$i} = join ', ', map { +/^l_/; ($select_tokens{$i}{"$'"} || $select_tokens{'trans'}{"$'"}) . " AS r_$'" } - ( grep( { !/qty$/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_qty l_partunit l_itime) ); + ( grep( { !/qty$/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_qty l_partunit l_shippingdate) ); } my $group_clause = join ", ", map { +/^l_/; "r_$'" } - ( grep( { !/qty$/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_partunit l_itime) ); + ( grep( { !/qty$/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_partunit l_shippingdate l_itime) ); $where_clause = defined($where_clause) ? $where_clause : ''; - my $query = - qq|SELECT DISTINCT $select{trans} - FROM inventory i1 - LEFT JOIN inventory i2 ON i1.trans_id = i2.trans_id - LEFT JOIN parts p ON i1.parts_id = p.id - LEFT JOIN bin b1 ON i1.bin_id = b1.id - LEFT JOIN bin b2 ON i2.bin_id = b2.id - LEFT JOIN warehouse w1 ON i1.warehouse_id = w1.id - LEFT JOIN warehouse w2 ON i2.warehouse_id = w2.id - LEFT JOIN transfer_type tt ON i1.trans_type_id = tt.id - LEFT JOIN project pr ON i1.project_id = pr.id - LEFT JOIN employee e ON i1.employee_id = e.id - WHERE $where_clause i2.qty = -i1.qty AND i2.qty > 0 AND - i1.trans_id IN ( SELECT i.trans_id FROM inventory i GROUP BY i.trans_id HAVING COUNT(i.trans_id) = 2 ) - GROUP BY $group_clause - - UNION + my $query = + qq|SELECT * FROM ( SELECT DISTINCT $select{out} FROM inventory i1 - LEFT JOIN inventory i2 ON i1.trans_id = i2.trans_id + LEFT JOIN inventory i2 ON i1.trans_id = i2.trans_id AND i1.id = i2.id LEFT JOIN parts p ON i1.parts_id = p.id LEFT JOIN bin b1 ON i1.bin_id = b1.id LEFT JOIN bin b2 ON i2.bin_id = b2.id @@ -467,15 +388,15 @@ sub get_warehouse_journal { LEFT JOIN transfer_type tt ON i1.trans_type_id = tt.id LEFT JOIN project pr ON i1.project_id = pr.id LEFT JOIN employee e ON i1.employee_id = e.id - WHERE $where_clause i1.qty < 0 AND - i1.trans_id IN ( SELECT i.trans_id FROM inventory i GROUP BY i.trans_id HAVING COUNT(i.trans_id) = 1 ) + WHERE $where_clause i1.qty != 0 AND tt.direction = 'out' AND + i1.trans_id IN ( SELECT i.trans_id FROM inventory i GROUP BY i.trans_id HAVING COUNT(i.trans_id) >= 1 ) GROUP BY $group_clause UNION SELECT DISTINCT $select{in} FROM inventory i1 - LEFT JOIN inventory i2 ON i1.trans_id = i2.trans_id + LEFT JOIN inventory i2 ON i1.trans_id = i2.trans_id AND i1.id = i2.id LEFT JOIN parts p ON i1.parts_id = p.id LEFT JOIN bin b1 ON i1.bin_id = b1.id LEFT JOIN bin b2 ON i2.bin_id = b2.id @@ -484,29 +405,27 @@ sub get_warehouse_journal { LEFT JOIN transfer_type tt ON i1.trans_type_id = tt.id LEFT JOIN project pr ON i1.project_id = pr.id LEFT JOIN employee e ON i1.employee_id = e.id - WHERE $where_clause i1.qty > 0 AND - i1.trans_id IN ( SELECT i.trans_id FROM inventory i GROUP BY i.trans_id HAVING COUNT(i.trans_id) = 1 ) + WHERE $where_clause i1.qty != 0 AND tt.direction = 'in' AND + i1.trans_id IN ( SELECT i.trans_id FROM inventory i GROUP BY i.trans_id HAVING COUNT(i.trans_id) >= 1 ) GROUP BY $group_clause - ORDER BY r_${sort_spec}|; + ORDER BY r_${sort_spec}) AS lines WHERE r_qty != 0|; + + my @all_vars = (@filter_vars,@filter_vars); + + if ($filter{limit}) { + $query .= " LIMIT ?"; + push @all_vars,$filter{limit}; + } + if ($filter{offset}) { + $query .= " OFFSET ?"; + push @all_vars, $filter{offset}; + } - my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars, @filter_vars, @filter_vars); + my $sth = prepare_execute_query($form, $dbh, $query, @all_vars); my ($h_oe_id, $q_oe_id); if ($form->{l_oe_id}) { $q_oe_id = <{oe_id} || $ref->{invoice_id})) { - my $id = $ref->{oe_id} ? $ref->{oe_id} : $ref->{invoice_id}; - do_statement($form, $h_oe_id, $q_oe_id, ($id) x 6); + do_statement($form, $h_oe_id, $q_oe_id, $ref->{oe_id}, ($ref->{invoice_id}) x 2); $ref->{oe_id_info} = $h_oe_id->fetchrow_hashref() || {}; } @@ -581,6 +487,7 @@ SQL # - warehouse_id - will return matches with this warehouse_id only # - partnumber - will return only matches where the given string is a substring of the partnumber # - partsid - will return matches with this parts_id only +# - classification_id - will return matches with this parts with this classification only # - description - will return only matches where the given string is a substring of the description # - chargenumber - will return only matches where the given string is a substring of the chargenumber # - bestbefore - will return only matches with this bestbefore date @@ -629,12 +536,17 @@ sub get_warehouse_report { if ($filter{partnumber}) { push @filter_ary, "p.partnumber ILIKE ?"; - push @filter_vars, '%' . $filter{partnumber} . '%'; + push @filter_vars, like($filter{partnumber}); + } + + if ($filter{classification_id}) { + push @filter_ary, "p.classification_id = ?"; + push @filter_vars, $filter{classification_id}; } if ($filter{description}) { push @filter_ary, "p.description ILIKE ?"; - push @filter_vars, '%' . $filter{description} . '%'; + push @filter_vars, like($filter{description}); } if ($filter{partsid}) { @@ -642,24 +554,34 @@ sub get_warehouse_report { push @filter_vars, $filter{partsid}; } + if ($filter{partsgroup_id}) { + push @filter_ary, "p.partsgroup_id = ?"; + push @filter_vars, $filter{partsgroup_id}; + } + if ($filter{chargenumber}) { push @filter_ary, "i.chargenumber ILIKE ?"; - push @filter_vars, '%' . $filter{chargenumber} . '%'; + push @filter_vars, like($filter{chargenumber}); } - if ($form->{bestbefore}) { + if (trim($form->{bestbefore})) { push @filter_ary, "?::DATE = i.bestbefore::DATE"; - push @filter_vars, $form->{bestbefore}; + push @filter_vars, trim($form->{bestbefore}); + } + + if ($filter{classification_id}) { + push @filter_ary, "p.classification_id = ?"; + push @filter_vars, $filter{classification_id}; } if ($filter{ean}) { push @filter_ary, "p.ean ILIKE ?"; - push @filter_vars, '%' . $filter{ean} . '%'; + push @filter_vars, like($filter{ean}); } - if ($filter{date}) { - push @filter_ary, "i.itime <= ?"; - push @filter_vars, $filter{date}; + if (trim($filter{date})) { + push @filter_ary, "i.shippingdate <= ?"; + push @filter_vars, trim($filter{date}); } if (!$filter{include_invalid_warehouses}){ push @filter_ary, "NOT (w.invalid)"; @@ -704,6 +626,8 @@ sub get_warehouse_report { "warehouseid" => "i.warehouse_id", "partnumber" => "p.partnumber", "partdescription" => "p.description", + "classification_id" => "p.classification_id", + "part_type" => "p.part_type", "bindescription" => "b.description", "binid" => "b.id", "chargenumber" => "i.chargenumber", @@ -712,14 +636,19 @@ sub get_warehouse_report { "chargeid" => "c.id", "warehousedescription" => "w.description", "partunit" => "p.unit", - "stock_value" => "p.lastcost / COALESCE(pfac.factor, 1)", + "stock_value" => ($form->{stock_value_basis} // '') eq 'list_price' ? "p.listprice / COALESCE(pfac.factor, 1)" : "p.lastcost / COALESCE(pfac.factor, 1)", + "purchase_price" => "p.lastcost", + "list_price" => "p.listprice", ); + $form->{l_classification_id} = 'Y'; + $form->{l_part_type} = 'Y'; + my $select_clause = join ', ', map { +/^l_/; "$select_tokens{$'} AS $'" } - ( grep( { !/qty/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), + ( grep( { !/qty/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_qty l_partunit) ); my $group_clause = join ", ", map { +/^l_/; "$'" } - ( grep( { !/qty/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), + ( grep( { !/qty/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_partunit) ); my %join_tokens = ( @@ -727,11 +656,23 @@ sub get_warehouse_report { ); my $joins = join ' ', grep { $_ } map { +/^l_/; $join_tokens{"$'"} } - ( grep( { !/qty/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), + ( grep( { !/qty/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_qty l_partunit) ); + my ($cvar_where, @cvar_values) = CVar->build_filter_query( + module => 'IC', + trans_id_field => 'p.id', + filter => $form, + sub_module => undef, + ); + + if ($cvar_where) { + $where_clause .= qq| AND ($cvar_where)|; + push @filter_vars, @cvar_values; + } + my $query = - qq|SELECT $select_clause + qq|SELECT * FROM ( SELECT $select_clause FROM inventory i LEFT JOIN parts p ON i.parts_id = p.id LEFT JOIN bin b ON i.bin_id = b.id @@ -739,9 +680,17 @@ sub get_warehouse_report { $joins WHERE $where_clause GROUP BY $group_clause - ORDER BY $sort_spec|; + ORDER BY $sort_spec ) AS lines WHERE qty<>0|; - my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars); + if ($filter{limit}) { + $query .= " LIMIT ?"; + push @filter_vars,$filter{limit}; + } + if ($filter{offset}) { + $query .= " OFFSET ?"; + push @filter_vars, $filter{offset}; + } + my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars ); my (%non_empty_bins, @all_fields, @contents); @@ -885,6 +834,40 @@ sub get_basic_bin_info { return map { $_->{bin_id} => $_ } @{ $result }; } + +sub get_basic_warehouse_info { + $main::lxdebug->enter_sub(); + + my $self = shift; + my %params = @_; + + Common::check_params(\%params, qw(id)); + + my $myconfig = \%main::myconfig; + my $form = $main::form; + + my $dbh = $params{dbh} || $form->get_standard_dbh(); + + my @ids = 'ARRAY' eq ref $params{id} ? @{ $params{id} } : ($params{id}); + + my $query = + qq|SELECT w.id AS warehouse_id, w.description AS warehouse_description + FROM warehouse w + WHERE w.id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)|; + + my $result = selectall_hashref_query($form, $dbh, $query, map { conv_i($_) } @ids); + + if ('' eq ref $params{id}) { + $result = $result->[0] || { }; + $main::lxdebug->leave_sub(); + + return $result; + } + + $main::lxdebug->leave_sub(); + + return map { $_->{warehouse_id} => $_ } @{ $result }; +} # # Eingabe: Teilenummer, Lagernummer (warehouse) # Ausgabe: Die maximale Anzahl der Teile in diesem Lager @@ -903,9 +886,9 @@ $main::lxdebug->enter_sub(); my $dbh = $params{dbh} || $form->get_standard_dbh(); my $query = qq| SELECT SUM(qty), bin_id, chargenumber, bestbefore FROM inventory where parts_id = ? AND warehouse_id = ? GROUP BY bin_id, chargenumber, bestbefore|; - my $sth_QTY = prepare_execute_query($form, $dbh, $query, ,$params{parts_id}, $params{warehouse_id}); #info: aufruf an DBUtils.pm + my $max_qty_parts = 0; #Initialisierung mit 0 while (my $ref = $sth_QTY->fetchrow_hashref()) { # wir laufen über alle Haltbarkeiten, chargen und Lagerorte (s.a. SQL-Query oben) $max_qty_parts += $ref->{sum}; @@ -977,18 +960,39 @@ $main::lxdebug->enter_sub(); $max_qty_parts += $ref->{sum}; $i++; if (($ref->{chargenumber} || $ref->{bestbefore}) && $ref->{sum} != 0){ - $error=1; + $error = 1; } } - #if ($i < 1){ - # $error = 2; - #} - $main::lxdebug->leave_sub(); return ($max_qty_parts, $error); } +sub get_wh_and_bin_for_charge { + $main::lxdebug->enter_sub(); + + my $self = shift; + my %params = @_; + my %bin_qty; + + croak t8('Need charge number!') unless $params{chargenumber}; + + my $inv_items = SL::DB::Manager::Inventory->get_all(where => [chargenumber => $params{chargenumber} ]); + + croak t8("Invalid charge number: #1", $params{chargenumber}) unless (ref @{$inv_items}[0] eq 'SL::DB::Inventory'); + # add all qty for one bin and add wh_id + ($bin_qty{$_->bin_id}{qty}, $bin_qty{$_->bin_id}{wh}) = ($bin_qty{$_->bin_id}{qty} + $_->qty, $_->warehouse_id) for @{ $inv_items }; + + while (my ($bin, $value) = each (%bin_qty)) { + if ($value->{qty} > 0) { + $main::lxdebug->leave_sub(); + return ($value->{qty}, $value->{wh}, $bin, $params{chargenumber}); + } + } + + $main::lxdebug->leave_sub(); + return undef; +} 1; __END__ @@ -1004,7 +1008,7 @@ SL::WH - Warehouse backend =head1 DESCRIPTION -Backend for lx-office warehousing functions. +Backend for kivitendo warehousing functions. =head1 FUNCTIONS @@ -1018,7 +1022,7 @@ is called like this: qty => 12.45, transfer_type => 'transfer', src_warehouse_id => 12, - stc_bin_id => 23, + src_bin_id => 23, dst_warehouse_id => 25, dst_bin_id => 167, }); @@ -1031,6 +1035,13 @@ 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. +It is possible to record stocktakings within this transaction as well. +This is useful if the transfer is the result of stocktaking (see also +C). To do so the parameters C, +C and C hava to be given. +If stocktaking should be saved, then the transfer quantity can be zero. In this +case no entry in inventory will be made, but only the stocktaking entry. + Here is a full list of parameters. All "_id" parameters except oe and orderitems can be called without id with RDB objects as well. @@ -1097,8 +1108,113 @@ An optional comment. An expiration date. Note that this is not by default used by C. +=item record_stocktaking + +A boolean flag to indicate that a stocktaking entry should be saved. + +=item stocktaking_qty + +The quantity for the stocktaking entry. + +=item stocktaking_cutoff_date + +The cutoff date for the stocktaking entry. + +=back + +=head2 create_assembly \%PARAMS, [ \%PARAMS, ... ] + +Creates an assembly if all defined items are available. + +Assembly item(s) will be stocked out and the assembly will be stocked in, +taking into account the qty and units which can be defined for each +assembly item separately. + +The calling params originate from C but only parts_id with the +attribute assembly are processed. + +The typical params would be: + + my %TRANSFER = ( + 'login' => $::myconfig{login}, + 'dst_warehouse_id' => $form->{warehouse_id}, + 'dst_bin_id' => $form->{bin_id}, + 'chargenumber' => $form->{chargenumber}, + 'bestbefore' => $form->{bestbefore}, + 'assembly_id' => $form->{parts_id}, + 'qty' => $form->{qty}, + 'comment' => $form->{comment} + ); + + +=head2 get_wh_and_bin_for_charge C<$params{chargenumber}> + +Gets the current qty from the inventory entries with the mandatory chargenumber: C<$params{chargenumber}>. +Croaks if the chargenumber is missing or no entry currently exists. +If there is one bin and warehouse with a positive qty, this fields are returned: +C C, C, C. +Otherwise returns undef. + + +=head3 Prerequisites + +All of these prerequisites have to be trueish, otherwise the function will exit +unsuccessfully with a return value of undef. + +=over 4 + +=item Mandantory params + + assembly_id, qty, login, dst_warehouse_id and dst_bin_id are mandatory. + +=item Subset named 'Assembly' of data set 'Part' + + assembly_id has to be an id in the table parts with the valid subset assembly. + +=item Assembly is composed of assembly item(s) + + There has to be at least one data set in the table assembly referenced to this assembly_id. + +=item Assembly can be disassembled + + Assemblies are like cakes. You cannot disassemble it. NEVER. + But if your assembly is a mechanical cake you may unscrew it. + Assemblies are created in one transaction therefore you can + safely rely on the trans_id in inventory to disassemble the + created assemblies (see action disassemble_assembly in wh.pl). + +=item The assembly item(s) have to be in the same warehouse + + inventory.warehouse_id equals dst_warehouse_id (client configurable). + +=item The assembly item(s) have to be in stock with the qty needed + + I can only make a cake by receipt if I have ALL ingredients and + in the needed stock amount. + The qty of stocked in assembly item(s) has to fit into the + number of the qty of the assemblies, which are going to be created (client configurable). + +=item assembly item(s) with the parts set 'service' are ignored + + The subset 'Services' of part will not transferred for assembly item(s). + =back +Client configurable prerequisites can be changed with different +prerequisites as described in client_config (s.a. next chapter). + + +=head2 default creation of assembly + +The valid state of the assembly item(s) used for the assembly process are +'out' for the general direction and 'used' as the specific reason. +The valid state of the assembly is 'in' for the direction and 'assembled' +as the specific reason. + +The method is transaction safe, in case of errors not a single entry will be made +in inventory. + + =head1 BUGS None yet.