do.pl sort Funktion verbessert

[kivitendo-erp.git] / SL / WH.pm

diff --git a/SL/WH.pm b/SL/WH.pm
index a25aa31..f363ae5 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -182,9 +182,14 @@ sub transfer_assembly {
   # 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 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 $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});
 
@@ -202,14 +207,44 @@ sub transfer_assembly {
   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 $currentPart_WH_ID = $hash_ref->{warehouse_id};
-    my $warehouse_info = $self->get_basic_warehouse_info('id' => $currentPart_WH_ID);
-    my $warehouse_desc = $warehouse_info->{"warehouse_description"};
 
+    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()
+    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){
@@ -881,6 +916,40 @@ sub get_basic_bin_info {
 
   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