X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FWH.pm;h=3cc2e2375c76ea7361b7485964c2d1a09042f09b;hb=44fb4fe8d98ced50689764dab64b4633016c9fe0;hp=9295600389720dbad917ae970d9464f3577bb22d;hpb=6d808fff5c446cc229deab6f5d2b97912ced9304;p=kivitendo-erp.git

diff --git a/SL/WH.pm b/SL/WH.pm
index 929560038..3cc2e2375 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;
@@ -59,7 +57,7 @@ sub transfer {
   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));
 
@@ -137,9 +135,7 @@ sub 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);
         }
       }
 
@@ -163,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;
@@ -204,9 +189,11 @@ sub transfer_assembly {
   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
@@ -290,9 +277,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});
@@ -331,32 +319,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}) {
-    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}) {
@@ -385,8 +373,8 @@ sub get_warehouse_journal {
   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");
 
@@ -411,8 +399,9 @@ sub get_warehouse_journal {
      "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}')",
      };
@@ -433,13 +422,14 @@ 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_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
@@ -631,12 +621,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 +636,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}) {
-    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)";
@@ -978,14 +968,10 @@ $main::lxdebug->enter_sub();
   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);
@@ -1006,7 +992,7 @@ SL::WH - Warehouse backend
 
 =head1 DESCRIPTION
 
-Backend for lx-office warehousing functions.
+Backend for kivitendo warehousing functions.
 
 =head1 FUNCTIONS
 
@@ -1020,7 +1006,7 @@ is called like this:
     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,
   });