From: Jan Büren Date: Fri, 14 May 2021 12:29:25 +0000 (+0200) Subject: Erzeugnis fertigen -> Zustand in Hilfstabelle dokumentieren X-Git-Tag: kivitendo-mebil_0.1-0~9^2~227 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=01f6500562203f8b7e0ed13d6b969c1ac47f51e0;p=kivitendo-erp.git Erzeugnis fertigen -> Zustand in Hilfstabelle dokumentieren --- diff --git a/SL/DB/Helper/Mappings.pm b/SL/DB/Helper/Mappings.pm index 94f7e4744..51350ebd0 100644 --- a/SL/DB/Helper/Mappings.pm +++ b/SL/DB/Helper/Mappings.pm @@ -99,6 +99,7 @@ my %kivitendo_package_names = ( ar => 'invoice', ap => 'purchase_invoice', assembly => 'assembly', + assembly_inventory_part => 'assembly_inventory_part', assortment_items => 'assortment_item', background_jobs => 'background_job', background_job_histories => 'background_job_history', diff --git a/SL/DB/MetaSetup/AssemblyInventoryPart.pm b/SL/DB/MetaSetup/AssemblyInventoryPart.pm new file mode 100644 index 000000000..d13a67155 --- /dev/null +++ b/SL/DB/MetaSetup/AssemblyInventoryPart.pm @@ -0,0 +1,37 @@ +# This file has been auto-generated. Do not modify it; it will be overwritten +# by rose_auto_create_model.pl automatically. +package SL::DB::AssemblyInventoryPart; + +use strict; + +use parent qw(SL::DB::Object); + +__PACKAGE__->meta->table('assembly_inventory_part'); + +__PACKAGE__->meta->columns( + inventory_assembly_id => { type => 'integer', not_null => 1 }, + inventory_part_id => { type => 'integer', not_null => 1 }, + itime => { type => 'timestamp', default => 'now()' }, + mtime => { type => 'timestamp' }, +); + +__PACKAGE__->meta->primary_key_columns([ 'inventory_assembly_id', 'inventory_part_id' ]); + +__PACKAGE__->meta->unique_keys([ 'inventory_part_id', 'inventory_assembly_id' ]); + +__PACKAGE__->meta->allow_inline_column_values(1); + +__PACKAGE__->meta->foreign_keys( + inventory_assembly => { + class => 'SL::DB::Inventory', + key_columns => { inventory_assembly_id => 'id' }, + }, + + inventory_part => { + class => 'SL::DB::Inventory', + key_columns => { inventory_part_id => 'id' }, + }, +); + +1; +; diff --git a/SL/WH.pm b/SL/WH.pm index 158b21643..d923d18eb 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -198,8 +198,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 $maxcreate=WH->check_assembly_max_create(assembly_id =>$params{'assembly_id'}, dbh => $my_dbh); - my $myconfig = \%main::myconfig; my $form = $main::form; my $kannNichtFertigen =""; # Falls leer dann erfolgreich @@ -234,10 +232,15 @@ sub transfer_assembly { my $sth_part_qty_assembly = prepare_execute_query($form, $dbh, $query, $params{assembly_id}); + my @trans_ids; + my $query_trans_id = qq|SELECT nextval('inventory_id_seq')|; + my $query_trans_ids = qq|INSERT INTO assembly_inventory_part (inventory_assembly_id, inventory_part_id) VALUES (?, ?)|; + my $sth_query_trans_ids = prepare_query($form, $dbh, $query_trans_ids); + # 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, shippingdate) - VALUES (?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, nextval('id'), + trans_id, 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 current_date))|; my $sthTransferPartSQL = prepare_query($form, $dbh, $transferPartSQL); @@ -278,9 +281,12 @@ sub transfer_assembly { my $temppart_bestbefore = localtime(); my $temppart_qty = $partsQTY * -1; + my ($trans_id) = selectrow_query($form, $dbh, $query_trans_id); + push @trans_ids, $trans_id; 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); + $self->get_part_description(parts_id => $params{assembly_id}), $params{login}, $temppart_qty, + $trans_id); next; } # Überprüfen, ob diese Anzahl gefertigt werden kann @@ -325,9 +331,11 @@ sub transfer_assembly { # wenn * -1 als berechnung in der parameter-übergabe angegeben wird. # Dieser Wert IST und BLEIBT positiv!! Hilfe. # Liegt das daran, dass dieser Wert aus einem SQL-Statement stammt? + my ($trans_id) = selectrow_query($form, $dbh, $query_trans_id); + push @trans_ids, $trans_id; 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); + $self->get_part_description(parts_id => $params{assembly_id}), $params{login}, $temppart_qty, $trans_id); # hier ist noch ein fehler am besten mit definierten erzeugnissen debuggen 02/2009 jb # idee: ausbuch algorithmus mit rekursion lösen und an- und abschaltbar machen @@ -335,9 +343,11 @@ sub transfer_assembly { # auf jeden fall war der internal-server-error nach aktivierung von strict und warnings plus ein paar my-definitionen weg } else { # okay, wir haben weniger oder gleich Waren die wir wegbuchen müssen, wir können also aufhören $tmpPartsQTY *=-1; + my ($trans_id) = selectrow_query($form, $dbh, $query_trans_id); + push @trans_ids, $trans_id; 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}, $tmpPartsQTY); + $self->get_part_description(parts_id => $params{assembly_id}), $params{login}, $tmpPartsQTY, $trans_id); last; # beendet die schleife (springt zum letzten element) } } # ende while SELECT SUM(qty), bin_id, chargenumber, bestbefore FROM inventory WHERE warehouse_id @@ -354,13 +364,20 @@ 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, shippingdate) - VALUES (?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, nextval('id'), + comment, employee_id, qty, trans_id, id, trans_type_id, shippingdate) + VALUES (?, ?, ?, ?, ?, ?, (SELECT id FROM employee WHERE login = ?), ?, nextval('id'), ?, (SELECT id FROM transfer_type WHERE direction = 'in' AND description = 'assembled'), (select current_date))|; my $sthTransferAssemblySQL = prepare_query($form, $dbh, $transferAssemblySQL); + my ($assembly_trans_id) = selectrow_query($form, $dbh, $query_trans_id); 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}); + $params{dst_bin_id}, $params{chargenumber}, conv_date($params{bestbefore}), $params{comment}, $params{login}, $params{qty}, $assembly_trans_id); + + # save inventory transactions for this assembly + for my $part_id (@trans_ids) { + do_statement($form, $sth_query_trans_ids, $query_trans_ids, $assembly_trans_id, $part_id); + } + 1; }) or do { return $kannNichtFertigen }; diff --git a/sql/Pg-upgrade2/assembly_inventory_part.sql b/sql/Pg-upgrade2/assembly_inventory_part.sql new file mode 100644 index 000000000..130191189 --- /dev/null +++ b/sql/Pg-upgrade2/assembly_inventory_part.sql @@ -0,0 +1,15 @@ +-- @tag: assembly_inventory_part +-- @description: Tabelle für die wirklich verbauten Einzelteile eines Erzeugnis +-- @depends: warehouse release_3_5_6_1 + + +CREATE TABLE assembly_inventory_part ( + inventory_part_id INTEGER REFERENCES inventory(id), + inventory_assembly_id INTEGER REFERENCES inventory(id), + itime TIMESTAMP DEFAULT now(), + mtime TIMESTAMP, + + PRIMARY KEY (inventory_assembly_id, inventory_part_id) +); + +CREATE TRIGGER mtime_assembly_inventory_part BEFORE UPDATE ON assembly_inventory_part FOR EACH ROW EXECUTE PROCEDURE set_mtime();