Issue #24595:do not clear _custid when shiptoid set to -1

Better just to remove these.