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));
)->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);
}
}
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 $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
# 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_id" => "i1.trans_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}')",
};
# 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
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)";
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