Erste Überarbeitung "Prüfen beim Speichern, ob Dokument geändert wurde."

[mfinanz.git] / SL / WH.pm

diff --git a/SL/WH.pm b/SL/WH.pm
index 3fbbfa4a5689bd5631a1aa2c786ac84165072cb7..22f4a4195b209217bd5ae687ebd64ab102ed445f 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -38,6 +38,9 @@ use SL::AM;
 use SL::DBUtils;
 use SL::Form;
 
 use SL::DBUtils;
 use SL::Form;
 

+use SL::DB::Unit;
+use SL::DB::Assembly;
+

 use warnings;
 use strict;
 
 use warnings;
 use strict;
 


@@ -56,7 +59,7 @@ sub transfer {
   require SL::DB::Employee;
   require SL::DB::Inventory;
 
   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 ($now)      = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT current_date|);
   my @directions = (undef, qw(out in transfer));
 


@@ -73,8 +76,10 @@ sub transfer {
     return;
   };
 
     return;
   };
 

+  my @trans_ids;
+

   my $db = SL::DB::Inventory->new->db;
   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')|);
 
     while (my $transfer = shift @args) {
       my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|);
 


@@ -105,14 +110,15 @@ sub transfer {
           trans_id         => $trans_id,
           shippingdate     => !$transfer->{shippingdate} || $transfer->{shippingdate} eq 'current_date'
                               ? $now : $transfer->{shippingdate},
           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) {
       );
 
       if ($unit) {

-        $qty *= $unit->factor;
-        $qty /= $part->unit_obj->factor || 1 if $part->unit;
+        $qty = $unit->convert_to($qty, $part->unit_obj);

       }
 
       }
 

+      $params{chargenumber} ||= '';
+

       if ($direction & 1) {
         SL::DB::Inventory->new(
           %params,
       if ($direction & 1) {
         SL::DB::Inventory->new(
           %params,


@@ -129,13 +135,25 @@ sub transfer {
           bin       => $dst_bin->id,
           qty       => $qty,
         )->save;
           bin       => $dst_bin->id,
           qty       => $qty,
         )->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}));
+        }

       }
       }

+
+      push @trans_ids, $trans_id;

     }
     }

+
+    1;

   }) or do {
     $::form->error("Warehouse transfer error: " . join("\n", (split(/\n/, $db->error))[0..2]));
   };
 
   $::lxdebug->leave_sub;
   }) or do {
     $::form->error("Warehouse transfer error: " . join("\n", (split(/\n/, $db->error))[0..2]));
   };
 
   $::lxdebug->leave_sub;

+
+  return @trans_ids;

 }
 
 sub transfer_assembly {
 }
 
 sub transfer_assembly {


@@ -145,6 +163,17 @@ 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 %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 $maxcreate=WH->check_assembly_max_create(assembly_id =>$params{'assembly_id'}, dbh => $my_dbh);
 
   my $myconfig = \%main::myconfig;


@@ -381,6 +410,7 @@ sub get_warehouse_journal {
      "trans_type"           => "tt.description",
      "trans_id"             => "i1.trans_id",
      "oe_id"                => "COALESCE(i1.oe_id, i2.oe_id)",
      "trans_type"           => "tt.description",
      "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",
      "itime"                => "i1.itime",
      "employee"             => "e.name",
      "date"                 => "i1.itime::DATE",
      "itime"                => "i1.itime",
      "employee"             => "e.name",


@@ -397,6 +427,8 @@ sub get_warehouse_journal {
      "warehouse_from"       => "'$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') {
   # 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') {


@@ -496,6 +528,18 @@ sub get_warehouse_journal {
       SELECT ap.id AS id, ap.invnumber AS number, 'purchase_invoice' AS type
       FROM ap
       WHERE ap.id = ?
       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);
   }
 SQL
     $h_oe_id = prepare_query($form, $dbh, $q_oe_id);
   }


@@ -516,8 +560,9 @@ SQL
       next if (('<=' eq $f_qty_op) && ($qty > $f_qty));
     }
 
       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() || {};
     }
 
       $ref->{oe_id_info} = $h_oe_id->fetchrow_hashref() || {};
     }
 


@@ -614,6 +659,14 @@ sub get_warehouse_report {
     push @filter_vars, '%' . $filter{ean} . '%';
   }
 
     push @filter_vars, '%' . $filter{ean} . '%';
   }
 

+  if ($filter{date}) {
+    push @filter_ary, "i.itime <= ?";
+    push @filter_vars, $filter{date};
+  }
+  if (!$filter{include_invalid_warehouses}){
+    push @filter_ary,  "NOT (w.invalid)";
+  }
+

   # prepare qty comparison for later filtering
   my ($f_qty_op, $f_qty, $f_qty_base_unit);
 
   # prepare qty comparison for later filtering
   my ($f_qty_op, $f_qty, $f_qty_base_unit);
 


@@ -893,7 +946,50 @@ $main::lxdebug->enter_sub();
 
   return $part_description;
 }
 
   return $part_description;
 }

+#
+# Eingabe:  Teilenummer, Lagerplatz_Id (bin_id)
+# Ausgabe:  Die maximale Anzahl der Teile in diesem Lagerplatz
+#           Bzw. Fehler, falls Chargen oder bestbefore
+#           bei eingelagerten Teilen definiert sind.
+#
+sub get_max_qty_parts_bin {
+$main::lxdebug->enter_sub();
+
+  my $self     = shift;
+  my %params   = @_;
+
+  Common::check_params(\%params, qw(parts_id bin_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), chargenumber, bestbefore  FROM inventory where parts_id = ?
+                            AND bin_id = ? GROUP BY chargenumber, bestbefore|;
+
+  my $sth_QTY      = prepare_execute_query($form, $dbh, $query, ,$params{parts_id}, $params{bin_id}); #info: aufruf an DBUtils.pm
+
+  my $max_qty_parts = 0; #Initialisierung mit 0
+  # falls derselbe artikel mehrmals eingelagert ist
+  # chargennummer, muss entsprechend händisch agiert werden
+  my $i = 0;
+  my $error;
+  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 ($i < 1){
+  #  $error = 2;
+  #}
+
+  $main::lxdebug->leave_sub();
+
+  return ($max_qty_parts, $error);
+}

 
 1;
 
 
 1;
 


@@ -1007,6 +1103,8 @@ An expiration date. Note that this is not by default used by C<warehouse_report>
 
 =head1 BUGS
 
 
 =head1 BUGS
 

+None yet.
+

 =head1 AUTHOR
 
 =cut
 =head1 AUTHOR
 
 =cut