X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/8fd886849e68f07a7e40af8566082917ab5196f3..49707e3c:/SL/WH.pm diff --git a/SL/WH.pm b/SL/WH.pm index 6fab5ec63..a25aa314e 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -37,9 +37,7 @@ package WH; use SL::AM; use SL::DBUtils; use SL::Form; - -use SL::DB::Unit; -use SL::DB::Assembly; +use SL::Util qw(trim); use warnings; use strict; @@ -161,17 +159,6 @@ sub transfer_assembly { 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; @@ -196,15 +183,17 @@ sub transfer_assembly { # (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 + 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 (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) + 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 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 @@ -215,17 +204,21 @@ sub transfer_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 = $hash_ref->{warehouse_id}; + my $warehouse_info = $self->get_basic_warehouse_info('id' => $currentPart_WH_ID); + my $warehouse_desc = $warehouse_info->{"warehouse_description"}; # Ü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}); + 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) . + $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) } @@ -239,7 +232,7 @@ sub transfer_assembly { 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); + 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; @@ -257,7 +250,7 @@ sub transfer_assembly { # 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}, + 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); @@ -267,7 +260,7 @@ sub transfer_assembly { # 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}, + 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) @@ -288,9 +281,10 @@ sub transfer_assembly { # 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) + 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 = 'stock'))|; + (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}); @@ -329,32 +323,32 @@ 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{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}) { + if (trim($form->{fromdate})) { push @filter_ary, "? <= i1.shippingdate"; - push @filter_vars, $form->{fromdate}; + push @filter_vars, trim($form->{fromdate}); } - if ($form->{todate}) { + if (trim($form->{todate})) { push @filter_ary, "? >= i1.shippingdate"; - push @filter_vars, $form->{todate}; + push @filter_vars, trim($form->{todate}); } if ($form->{l_employee}) { @@ -631,12 +625,12 @@ 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{description}) { push @filter_ary, "p.description ILIKE ?"; - push @filter_vars, '%' . $filter{description} . '%'; + push @filter_vars, like($filter{description}); } if ($filter{partsid}) { @@ -646,22 +640,22 @@ sub get_warehouse_report { 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{ean}) { push @filter_ary, "p.ean ILIKE ?"; - push @filter_vars, '%' . $filter{ean} . '%'; + push @filter_vars, like($filter{ean}); } - if ($filter{date}) { + if (trim($filter{date})) { push @filter_ary, "i.shippingdate <= ?"; - push @filter_vars, $filter{date}; + push @filter_vars, trim($filter{date}); } if (!$filter{include_invalid_warehouses}){ push @filter_ary, "NOT (w.invalid)"; @@ -905,9 +899,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};