use Carp;
use List::Util qw(max);
+use SL::DBUtils ();
use SL::PrefixedNumber;
sub oe_scoping {
}
sub parts_scoping {
- SL::DB::Manager::Part->type_filter($_[0]);
+ # SL::DB::Manager::Part->type_filter($_[0]);
}
my %specs = ( ar => { number_column => 'invnumber', },
part => { number_column => 'partnumber', number_range_column => 'articlenumber', scoping => \&parts_scoping, },
service => { number_column => 'partnumber', number_range_column => 'servicenumber', scoping => \&parts_scoping, },
assembly => { number_column => 'partnumber', number_range_column => 'assemblynumber', scoping => \&parts_scoping, },
+ assortment => { number_column => 'partnumber', number_range_column => 'assortmentnumber', scoping => \&parts_scoping, },
);
sub get_next_trans_number {
}
}
- my %numbers_in_use = map { ( $_->$number_column => 1 ) } @{ $self->_get_manager_class->get_all(%conditions_for_in_use) };
+ # Lock both the table where the new number is stored and the range
+ # table. The storage table has to be locked first in order to
+ # prevent deadlocks as the legacy code in SL/TransNumber.pm locks it
+ # first, too.
+
+ # For the storage table we have to use a full lock in order to
+ # prevent insertion of new entries while this routine is still
+ # working. For the range table we only need a row-level lock,
+ # therefore we're re-loading the row.
+ $self->db->dbh->do("LOCK " . $self->meta->table) || die $self->db->dbh->errstr;
+
+ my ($query_in_use, $bind_vals_in_use) = Rose::DB::Object::QueryBuilder::build_select(
+ dbh => $self->db->dbh,
+ select => $number_column,
+ tables => [ $self->meta->table ],
+ columns => { $self->meta->table => [ $self->meta->column_names ] },
+ query_is_sql => 1,
+ %conditions_for_in_use,
+ );
+
+ my @numbers = do { no warnings 'once'; SL::DBUtils::selectall_array_query($::form, $self->db->dbh, $query_in_use, @{ $bind_vals_in_use || [] }) };
+ my %numbers_in_use = map { ( $_ => 1 ) } @numbers;
+
+ my $range_table = ($business ? $business : SL::DB::Default->get)->load(for_update => 1);
- my $range_table = $business ? $business : SL::DB::Default->get;
my $start_number = $range_table->$number_range_column;
- $start_number = $range_table->articlenumber if ($number_range_column eq 'assemblynumber') && (length($start_number) < 1);
- my $sequence = SL::PrefixedNumber->new(number => $start_number);
+ $start_number = $range_table->articlenumber if ($number_range_column =~ /^(assemblynumber|assortmentnumber)$/) && (length($start_number) < 1);
+ my $sequence = SL::PrefixedNumber->new(number => $start_number // 0);
if (!$fill_holes_in_range) {
- my @numbers = map { $_->$number_column } @{ $self->_get_manager_class->get_all(%conditions) };
$sequence->set_to_max(@numbers) ;
}
Now the number itself is increased as often as neccessary to create a
unique one by comparing the generated numbers with the existing ones
retrieved in the first step. In this step gaps in the assigned numbers
-are filled for some tables (e.g. invoices) but not for others
-(e.g. sales orders).
+are filled for all currently supported tables.
After creating the unique record number this function can update
C<$self> and the C<defaults> table if requested. This is controlled