X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FWH.pm;h=52e174ff0bfe3c4ed6a3e564d6b54fc312e5af7b;hb=1b032ef45d886922f1fe347ec234c9b0c8c50efd;hp=979d4de19aedfc20e8ab32ff596ee5902789df93;hpb=c9cace869bcf939c42de9c142df65d7c214ecdbc;p=kivitendo-erp.git diff --git a/SL/WH.pm b/SL/WH.pm index 979d4de19..52e174ff0 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -61,7 +61,7 @@ sub transfer { require SL::DB::Part; require SL::DB::Employee; - 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)); @@ -191,183 +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 $maxcreate=WH->check_assembly_max_create(assembly_id =>$params{'assembly_id'}, dbh => $my_dbh); - - my $myconfig = \%main::myconfig; - my $form = $main::form; - my $kannNichtFertigen =""; # Falls leer dann erfolgreich - - SL::DB->client->with_transaction(sub { - my $dbh = $params{dbh} || SL::DB->client->dbh; - - # 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)|; - - # Lager in dem die Bestandteile gesucht werden kann entweder das Ziellager sein oder ist per Mandantenkonfig - # auf das Standardlager des Bestandteiles schaltbar - - my $use_default_warehouse = $::instance_conf->get_transfer_default_warehouse_for_assembly; - - my $query = qq|SELECT assembly.parts_id, assembly.qty, parts.warehouse_id - FROM assembly INNER JOIN parts ON assembly.parts_id = parts.id - WHERE assembly.id = ? AND parts.part_type != 'service'|; - - 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, shippingdate) - VALUES (?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, nextval('id'), - (SELECT id FROM transfer_type WHERE direction = 'out' AND description = 'used'), - (SELECT current_date))|; - my $sthTransferPartSQL = prepare_query($form, $dbh, $transferPartSQL); - - # der return-string für die fehlermeldung inkl. welche waren zum fertigen noch fehlen - - 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}; - - my $currentPart_WH_ID = $use_default_warehouse && $hash_ref->{warehouse_id} ? $hash_ref->{warehouse_id} : $params{dst_warehouse_id}; - my $no_check = 0; - - # Prüfen ob Erzeugnis-Teile Standardlager haben. - if ($use_default_warehouse && ! $hash_ref->{warehouse_id}) { - # Prüfen ob in Mandantenkonfiguration ein Standardlager aktiviert isti. - if ($::instance_conf->get_transfer_default_ignore_onhand) { - $currentPart_WH_ID = $::instance_conf->get_warehouse_id_ignore_onhand; - $no_check = 1; - } else { - $kannNichtFertigen .= "Kein Standardlager: " . - " Die Ware " . $self->get_part_description(parts_id => $currentPart_ID) . - " hat kein Standardlager definiert " . - ", um das Erzeugnis herzustellen.
"; - next; - } - } - my $warehouse_info = $self->get_basic_warehouse_info('id'=> $currentPart_WH_ID); - my $warehouse_desc = $warehouse_info->{"warehouse_description"}; - - # Fertigen ohne Prüfung nach Bestand - if ($no_check) { - my $temppart_bin_id = $::instance_conf->get_bin_id_ignore_onhand; - my $temppart_chargenumber = ""; - my $temppart_bestbefore = localtime(); - my $temppart_qty = $partsQTY * -1; - - do_statement($form, $sthTransferPartSQL, $transferPartSQL, $currentPart_ID, $currentPart_WH_ID, - $temppart_bin_id, $temppart_chargenumber, $temppart_bestbefore, 'Verbraucht für ' . - $self->get_part_description(parts_id => $params{assembly_id}), $params{login}, $temppart_qty); - next; - } - # Ü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 => $currentPart_WH_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) . - " im Lager: " . $warehouse_desc . - ", 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, $currentPart_WH_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, $currentPart_WH_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, $currentPart_WH_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 - die "

" . $kannNichtFertigen if ($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, shippingdate) - VALUES (?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, nextval('id'), - (SELECT id FROM transfer_type WHERE direction = 'in' AND description = 'assembled'), - (select current_date))|; - 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}); - 1; - }) or do { return $kannNichtFertigen }; - - $main::lxdebug->leave_sub(); - return 1; # Alles erfolgreich -} - sub get_warehouse_journal { $main::lxdebug->enter_sub(); @@ -483,6 +306,18 @@ sub get_warehouse_journal { 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))", @@ -502,6 +337,7 @@ 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.shippingdate", @@ -522,6 +358,7 @@ sub get_warehouse_journal { }; $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}; @@ -530,35 +367,19 @@ sub get_warehouse_journal { # 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_shippingdate) ); + ( 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_shippingdate 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 * FROM (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 - + 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 @@ -567,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 @@ -584,12 +405,12 @@ 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}) AS lines WHERE r_qty>0|; + ORDER BY r_${sort_spec}) AS lines WHERE r_qty != 0|; - my @all_vars = (@filter_vars,@filter_vars,@filter_vars); + my @all_vars = (@filter_vars,@filter_vars); if ($filter{limit}) { $query .= " LIMIT ?"; @@ -733,6 +554,11 @@ 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, like($filter{chargenumber}); @@ -818,11 +644,11 @@ sub get_warehouse_report { $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 = ( @@ -830,9 +656,21 @@ 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 * FROM ( SELECT $select_clause FROM inventory i @@ -1135,15 +973,25 @@ sub get_wh_and_bin_for_charge { my $self = shift; my %params = @_; + my %bin_qty; croak t8('Need charge number!') unless $params{chargenumber}; - my $inv_item= SL::DB::Manager::Inventory->get_first(where => [chargenumber => $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_item eq 'SL::DB::Inventory'); + 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 ($inv_item->warehouse_id, $inv_item->bin_id, $inv_item->chargenumber); + return undef; } 1; @@ -1301,10 +1149,11 @@ The typical params would be: =head2 get_wh_and_bin_for_charge C<$params{chargenumber}> -Gets the first inventory entry with the mandatory chargenumber: 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. -From the found inventory entry the following values and in this order are returned: -C, C, C. +If there is one bin and warehouse with a positive qty, this fields are returned: +C C, C, C. +Otherwise returns undef. =head3 Prerequisites @@ -1326,10 +1175,13 @@ unsuccessfully with a return value of undef. There has to be at least one data set in the table assembly referenced to this assembly_id. -=item Assembly cannot be destroyed or disassembled +=item Assembly can be disassembled Assemblies are like cakes. You cannot disassemble it. NEVER. - No negative nor zero qty's are valid inputs. + 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 @@ -1362,26 +1214,6 @@ as the specific reason. The method is transaction safe, in case of errors not a single entry will be made in inventory. -Two prerequisites can be changed with these global parameters - -=over 2 - -=item $::instance_conf->get_transfer_default_warehouse_for_assembly - - If trueish we try to get all the items form the default bins defined in parts - and do not try to find them in the destination warehouse. Returns an - error if not all items have set a default bin in parts. - -=item $::instance_conf->get_bin_id_ignore_onhand - - If trueish we can create assemblies even if we do not have enough items in stock. - The needed qty will be booked in a special bin, which has to be configured in - the client config. - -=back - - - =head1 BUGS