X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/452b8c102a35d5284ef9c1492c7a43306beb9825..3160b0888:/SL/WH.pm

diff --git a/SL/WH.pm b/SL/WH.pm
index 9b9e521c2..cd748d413 100644
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -210,6 +210,20 @@ sub transfer_assembly {
 
     my $partsQTY          = $hash_ref->{qty} * $params{qty}; # benötigte teile * anzahl erzeugnisse
     my $currentPart_ID    = $hash_ref->{parts_id};
+
+    # 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) {
+        $hash_ref->{warehouse_id} = $::instance_conf->get_warehouse_id_ignore_onhand;
+      } 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 $currentPart_WH_ID = $use_default_warehouse ? $hash_ref->{warehouse_id} : $params{dst_warehouse_id};
     my $warehouse_info    = $self->get_basic_warehouse_info('id'=> $currentPart_WH_ID);
     my $warehouse_desc    = $warehouse_info->{"warehouse_description"};
@@ -887,6 +901,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