use SL::DBUtils;
use SL::Form;
+use warnings;
+use strict;
+
sub transfer {
$main::lxdebug->enter_sub();
my ($now) = selectrow_query($form, $dbh, qq|SELECT current_date|);
- $query = qq|INSERT INTO inventory (warehouse_id, bin_id, parts_id, chargenumber, oe_id, orderitems_id, shippingdate,
+ $query = qq|INSERT INTO inventory (warehouse_id, bin_id, parts_id, chargenumber, bestbefore,
+ oe_id, orderitems_id, shippingdate,
employee_id, project_id, trans_id, trans_type_id, comment, qty)
- VALUES (?, ?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, ?, ?, ?, ?)|;
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, ?, ?, ?, ?)|;
$sth = prepare_query($form, $dbh, $query);
$direction |= 1 if ($transfer->{src_warehouse_id} && $transfer->{src_bin_id});
$direction |= 2 if ($transfer->{dst_warehouse_id} && $transfer->{dst_bin_id});
- push @values, conv_i($transfer->{parts_id}), "$transfer->{chargenumber}", conv_i($transfer->{oe_id}), conv_i($transfer->{orderitems_id});
+ push @values, conv_i($transfer->{parts_id}), "$transfer->{chargenumber}", conv_date($transfer->{bestbefore}), conv_i($transfer->{oe_id}), conv_i($transfer->{orderitems_id});
push @values, $transfer->{shippingdate} eq 'current_date' ? $now : conv_date($transfer->{shippingdate}), $form->{login}, conv_i($transfer->{project_id}), $trans_id;
if ($transfer->{transfer_type_id}) {
$main::lxdebug->leave_sub();
}
+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 $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 ="Für dieses Erzeugnis sind keine Einzelteile definiert.
+ Dementsprechend kann auch nichts hergestellt werden";
+
+ while (my $hash_ref = $sth_part_qty_assembly->fetchrow_hashref()) { #Schleife für select parts_id,(...) from assembly
+ $kannNichtFertigen =""; # Wieder auf erfolgreich setzen LEER == keine Fehlermeldung
+ 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. <br>"; # 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 = $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 ($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}, $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();
my $dbh = $form->get_standard_dbh($myconfig);
# filters
- my (@filter_ary, @filter_vars, $joins);
+ my (@filter_ary, @filter_vars, $joins, %select_tokens, %select);
if ($filter{warehouse_id} ne '') {
push @filter_ary, "w1.id = ? OR w2.id = ?";
push @filter_vars, '%' . $filter{chargenumber} . '%';
}
+ if ($form->{bestbefore}) {
+ push @filter_ary, "?::DATE = i1.bestbefore::DATE";
+ push @filter_vars, $form->{bestbefore};
+ }
+
if ($form->{fromdate}) {
push @filter_ary, "?::DATE <= i1.itime::DATE";
push @filter_vars, $form->{fromdate};
$filter{na} = '-' unless $filter{na};
# make order, search in $filter and $form
- $form->{sort} = $filter{sort} unless $form->{sort};
- $form->{order} = ($form->{sort} = 'itime') unless $form->{sort};
- $form->{sort} = 'itime' if $form->{sort} eq "date";
- $form->{order} = $filter{order} unless $form->{order};
- $form->{sort} .= (($form->{order}) ? " DESC" : " ASC");
+ my $sort_col = $form->{sort};
+ 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");
my $where_clause = join(" AND ", @filter_ary) . " AND " if (@filter_ary);
"partdescription" => "p.description",
"bindescription" => "b.description",
"chargenumber" => "i1.chargenumber",
+ "bestbefore" => "i1.bestbefore",
"warehousedescription" => "w.description",
"partunit" => "p.unit",
"bin_from" => "b1.description",
"comment" => "i1.comment",
"trans_type" => "tt.description",
"trans_id" => "i1.trans_id",
+ "oe_id" => "COALESCE(i1.oe_id, i2.oe_id)",
"date" => "i1.itime::DATE",
"itime" => "i1.itime",
"employee" => "e.name",
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 )
GROUP BY $group_clause
- ORDER BY r_$form->{sort}|;
+ ORDER BY r_${sort_spec}|;
my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars, @filter_vars, @filter_vars);
+ my ($h_oe_id, $q_oe_id);
+ if ($form->{l_oe_id}) {
+ $q_oe_id = <<SQL;
+ SELECT oe.id AS id,
+ CASE WHEN oe.quotation THEN oe.quonumber ELSE oe.ordnumber END AS number,
+ CASE
+ WHEN oe.customer_id IS NOT NULL AND COALESCE(oe.quotation, FALSE) THEN 'sales_quotation'
+ WHEN oe.customer_id IS NOT NULL AND NOT COALESCE(oe.quotation, FALSE) THEN 'sales_order'
+ WHEN oe.customer_id IS NULL AND COALESCE(oe.quotation, FALSE) THEN 'request_quotation'
+ ELSE 'purchase_order'
+ END AS type
+ FROM oe
+ WHERE oe.id = ?
+
+ UNION
+
+ SELECT dord.id AS id, dord.donumber AS number,
+ CASE
+ WHEN dord.customer_id IS NULL THEN 'purchase_delivery_order'
+ ELSE 'sales_delivery_order'
+ END AS type
+ FROM delivery_orders dord
+ WHERE dord.id = ?
+
+ UNION
+
+ SELECT ar.id AS id, ar.invnumber AS number, 'sales_invoice' AS type
+ FROM ar
+ WHERE ar.id = ?
+
+ UNION
+
+ SELECT ap.id AS id, ap.invnumber AS number, 'purchase_invoice' AS type
+ FROM ap
+ WHERE ap.id = ?
+SQL
+ $h_oe_id = prepare_query($form, $dbh, $q_oe_id);
+ }
+
my @contents = ();
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
map { /^r_/; $ref->{"$'"} = $ref->{$_} } keys %$ref;
my $qty = $ref->{"qty"} * 1;
next if (('<=' eq $f_qty_op) && ($qty > $f_qty));
}
+ if ($h_oe_id && $ref->{oe_id}) {
+ do_statement($form, $h_oe_id, $q_oe_id, ($ref->{oe_id}) x 4);
+ $ref->{oe_id_info} = $h_oe_id->fetchrow_hashref() || {};
+ }
+
push @contents, $ref;
}
$sth->finish();
+ $h_oe_id->finish() if $h_oe_id;
$main::lxdebug->leave_sub();
# - partsid - will return matches with this parts_id 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
+# - ean - will return only matches where the given string is a substring of the ean as stored in the table parts (article)
# - charge_ids - must be an arrayref. will return contents with these ids only
# - expires_in - will only return matches that expire within the given number of days
# will also add a column named 'has_expired' containing if the match has already expired or not
my $dbh = $form->get_standard_dbh($myconfig);
# filters
- my (@filter_ary, @filter_vars, @wh_bin_filter_ary, @wh_bin_filter_vars, $columns, $group_by);
+ my (@filter_ary, @filter_vars, @wh_bin_filter_ary, @wh_bin_filter_vars);
delete $form->{include_empty_bins} unless ($form->{l_warehousedescription} || $form->{l_bindescription});
push @filter_vars, '%' . $filter{chargenumber} . '%';
}
+ if ($form->{bestbefore}) {
+ push @filter_ary, "?::DATE = i.bestbefore::DATE";
+ push @filter_vars, $form->{bestbefore};
+ }
+
+ if ($filter{ean}) {
+ push @filter_ary, "p.ean ILIKE ?";
+ push @filter_vars, '%' . $filter{ean} . '%';
+ }
+
# prepare qty comparison for later filtering
my ($f_qty_op, $f_qty, $f_qty_base_unit);
map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
# make order, search in $filter and $form
- $form->{sort} = $filter{sort} unless $form->{sort};
- $form->{sort} = "parts_id" unless $form->{sort};
- $form->{order} = $filter{order} unless $form->{order};
- $form->{sort} =~ s/ASC|DESC//; # kill stuff left in from previous queries
- my $orderby = $form->{sort};
- $form->{sort} .= (($form->{order}) ? " DESC" : " ASC");
+ my $sort_col = $form->{sort};
+ my $sort_order = $form->{order};
+
+ $sort_col = $filter{sort} unless $sort_col;
+ $sort_col = "parts_id" unless $sort_col;
+ $sort_order = $filter{order} unless $sort_order;
+ $sort_col =~ s/ASC|DESC//; # kill stuff left in from previous queries
+ my $orderby = $sort_col;
+ my $sort_spec = "${sort_col} " . ($sort_order ? " DESC" : " ASC");
my $where_clause = join " AND ", ("1=1", @filter_ary);
"bindescription" => "b.description",
"binid" => "b.id",
"chargenumber" => "i.chargenumber",
+ "bestbefore" => "i.bestbefore",
+ "ean" => "p.ean",
"chargeid" => "c.id",
"warehousedescription" => "w.description",
"partunit" => "p.unit",
my $query =
qq|SELECT $select_clause
- $columns
FROM inventory i
LEFT JOIN parts p ON i.parts_id = p.id
LEFT JOIN bin b ON i.bin_id = b.id
LEFT JOIN warehouse w ON i.warehouse_id = w.id
$joins
WHERE $where_clause
- GROUP BY $group_clause $group_by
- ORDER BY $form->{sort}|;
+ GROUP BY $group_clause
+ ORDER BY $sort_spec|;
my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars);
my (%non_empty_bins, @all_fields, @contents);
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
$ref->{qty} *= 1;
my $qty = $ref->{qty};
- next unless ($qty > 0);
+ next unless ($qty != 0);
if ($f_qty_op) {
my $part_unit = $all_units->{$ref->{partunit}};
@all_fields = keys %{ $ref } unless (@all_fields);
}
- $ref->{stock_value} *= $ref->{qty};
+ $ref->{stock_value} = ($ref->{stock_value} || 0) * $ref->{qty};
push @contents, $ref;
}
$sth = prepare_execute_query($form, $dbh, $query, @filter_vars);
- while ($ref = $sth->fetchrow_hashref()) {
+ while (my $ref = $sth->fetchrow_hashref()) {
map { $ref->{$_} ||= "" } @all_fields;
push @contents, $ref;
}
return map { $_->{bin_id} => $_ } @{ $result };
}
+#
+# Eingabe: Teilenummer, Lagernummer (warehouse)
+# Ausgabe: Die maximale Anzahl der Teile in diesem Lager
+#
+sub get_max_qty_parts {
+$main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my %params = @_;
+
+ Common::check_params(\%params, qw(parts_id warehouse_id)); #die brauchen wir
+
+ my $myconfig = \%main::myconfig;
+ my $form = $main::form;
+
+ 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};
+ }
+
+ $main::lxdebug->leave_sub();
+
+ return $max_qty_parts;
+}
+
+#
+# Eingabe: Teilenummer, Lagernummer (warehouse)
+# Ausgabe: Die Beschreibung der Ware bzw. Erzeugnis
+#
+sub get_part_description {
+$main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my %params = @_;
+
+ Common::check_params(\%params, qw(parts_id)); #die brauchen wir
+
+ my $myconfig = \%main::myconfig;
+ my $form = $main::form;
+
+ my $dbh = $params{dbh} || $form->get_standard_dbh();
+
+ my $query = qq| SELECT partnumber, description FROM parts where id = ? |;
+
+ my $sth = prepare_execute_query($form, $dbh, $query, ,$params{parts_id}); #info: aufruf zu DBUtils.pm
+
+ my $ref = $sth->fetchrow_hashref();
+ my $part_description = $ref->{partnumber} . " " . $ref->{description};
+
+ $main::lxdebug->leave_sub();
+
+ return $part_description;
+}
1;