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;
require SL::DB::Employee;
require SL::DB::Inventory;
- my $employee = SL::DB::Manager::Employee->find_by(login => $::form->{login});
+ my $employee = SL::DB::Manager::Employee->find_by(login => $::myconfig{login});
my ($now) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT current_date|);
my @directions = (undef, qw(out in transfer));
my @trans_ids;
my $db = SL::DB::Inventory->new->db;
- $db->do_transaction(sub{
+ $db->with_transaction(sub{
while (my $transfer = shift @args) {
my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|);
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),
+ map { $_ => $transfer->{$_} } qw(chargenumber bestbefore oe_id delivery_order_items_stock_id invoice_id comment),
);
if ($unit) {
)->save;
# Standardlagerplatz in Stammdaten gleich mitverschieben
if (defined($transfer->{change_default_bin})){
- my $part = SL::DB::Part->new(id => conv_i($transfer->{parts_id}))->load;
- $part->update_attributes(warehouse_id => conv_i($transfer->{dst_warehouse_id}));
- $part->update_attributes(bin_id => conv_i($transfer->{dst_bin_id}));
+ $part->update_attributes(warehouse_id => $dst_wh->id, bin_id => $dst_bin->id);
}
- }
+ }
push @trans_ids, $trans_id;
}
+
+ 1;
}) or do {
$::form->error("Warehouse transfer error: " . join("\n", (split(/\n/, $db->error))[0..2]));
};
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;
# 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 $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 $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 (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
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 $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. <br>";
+ 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 => $params{dst_warehouse_id});
+ 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) .
+ $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. <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)
}
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;
# 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);
# 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)
# 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});
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}) {
- 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}) {
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 = ($sort_col = 'shippingdate') unless $sort_col;
+ $sort_col = 'shippingdate' if $sort_col eq 'date';
$sort_order = $filter{order} unless $sort_order;
my $sort_spec = "${sort_col} " . ($sort_order ? " DESC" : " ASC");
"trans_type" => "tt.description",
"trans_id" => "i1.trans_id",
"oe_id" => "COALESCE(i1.oe_id, i2.oe_id)",
- "date" => "i1.itime::DATE",
+ "invoice_id" => "COALESCE(i1.invoice_id, i2.invoice_id)",
+ "date" => "i1.shippingdate",
"itime" => "i1.itime",
+ "shippingdate" => "i1.shippingdate",
"employee" => "e.name",
"projectnumber" => "COALESCE(pr.projectnumber, '$filter{na}')",
};
"warehouse_from" => "'$filter{na}'",
};
+ $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_/ 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_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_partunit l_shippingdate) );
$where_clause = defined($where_clause) ? $where_clause : '';
+
my $query =
qq|SELECT DISTINCT $select{trans}
FROM inventory i1
SELECT ap.id AS id, ap.invnumber AS number, 'purchase_invoice' AS type
FROM ap
WHERE ap.id = ?
+
+ UNION
+
+ SELECT ar.id AS id, ar.invnumber AS number, 'sales_invoice' AS type
+ FROM ar
+ WHERE ar.id = (SELECT trans_id FROM invoice WHERE id = ?)
+
+ UNION
+
+ SELECT ap.id AS id, ap.invnumber AS number, 'purchase_invoice' AS type
+ FROM ap
+ WHERE ap.id = (SELECT trans_id FROM invoice WHERE id = ?)
SQL
$h_oe_id = prepare_query($form, $dbh, $q_oe_id);
}
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);
+ if ($h_oe_id && ($ref->{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);
$ref->{oe_id_info} = $h_oe_id->fetchrow_hashref() || {};
}
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}) {
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}) {
- 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)";
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
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};
while (my $ref = $sth_QTY->fetchrow_hashref()) { # wir laufen über alle Haltbarkeiten und Chargen(s.a. SQL-Query oben)
$max_qty_parts += $ref->{sum};
$i++;
- if ($ref->{chargenumber} || $ref->{bestbefore}){
- $error=1;
+ if (($ref->{chargenumber} || $ref->{bestbefore}) && $ref->{sum} != 0){
+ $error = 1;
}
}
- #if ($i < 1){
- # $error = 2;
- #}
-
$main::lxdebug->leave_sub();
return ($max_qty_parts, $error);
=head1 DESCRIPTION
-Backend for lx-office warehousing functions.
+Backend for kivitendo warehousing functions.
=head1 FUNCTIONS
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,
});
projects / kivitendo-erp.git / blobdiff