WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementBiller.java

                             + " of " + qty + " free in the source's vendor warehouses");
                     continue;
+                }
+            }
+            // The order is priced from one cost layer; only units received at that price (or with no cost recorded,
+            // which is what a catalog-priced line moves) may fill it, so the layers left behind stay true.
+            Float price = order.getLineItem().getUnitPrice();
             for (Map.Entry<Integer, Integer> chunk : chunks.entrySet()) {
                 Line line = new Line();
                 line.orderId = order.getId();
                 line.itemId = itemId;
                 line.item = description;
                 line.qty = chunk.getValue();
                 line.fromWarehouseId = chunk.getKey();
                 line.repoint = repoint;
                 line.serialized = serialized;
-                String poolKey = key(chunk.getKey(), itemId);
+                String poolKey = key(chunk.getKey(), itemId) + "@" + price;
                 if (serialized) {
-                    List<String> pool = serialPools.computeIfAbsent(poolKey, x -> this.billableImeis(itemId, chunk.getKey()));
+                    List<String> pool = serialPools.computeIfAbsent(poolKey, x -> this.billableImeis(itemId, chunk.getKey(), price));
                     if (pool.size() < line.qty) {
                         plan.problems.add("order " + order.getId() + " " + description + ": " + pool.size()
-                                + " billable IMEI(s) in warehouse " + chunk.getKey() + ", needs " + line.qty);
+                                + " billable IMEI(s) at " + price + " in warehouse " + chunk.getKey() + ", needs " + line.qty);
                         continue;
+                    }
                     line.imeis.addAll(pool.subList(0, line.qty));
                     pool.subList(0, line.qty).clear();
                 } else {
-                    int lots = lotPools.computeIfAbsent(poolKey, x -> this.billableLotQuantity(itemId, chunk.getKey()));
+                    int lots = lotPools.computeIfAbsent(poolKey, x -> this.billableLotQuantity(itemId, chunk.getKey(), price));
                     if (lots < line.qty) {
                         plan.problems.add("order " + order.getId() + " " + description + ": " + lots
-                                + " billable unit(s) in warehouse " + chunk.getKey() + ", needs " + line.qty);
+                                + " billable unit(s) at " + price + " in warehouse " + chunk.getKey() + ", needs " + line.qty);
                         continue;
+                    }
                     lotPools.put(poolKey, lots - line.qty);
+                }
                 plan.lines.add(line);
+        }
         return plan;
+    }
     // Billing takes an IMEI only at quantity 1 with a last scan that leaves it in stock (WarehouseServiceImpl billing).
+    // Only units at the billed price, then those with no cost recorded - core billing ranks lots the same way.
-    private List<String> billableImeis(int itemId, int vendorWarehouseId) {
+    private List<String> billableImeis(int itemId, int vendorWarehouseId, Float price) {
         return warehouseInventoryItemRepository.selectBillableStock(itemId, vendorWarehouseId).stream()
                 .filter(x -> x.getCurrentQuantity() == 1 && x.getSerialNumber() != null && !x.getSerialNumber().trim().isEmpty())
                 .filter(x -> WarehouseServiceImpl.GOOD_SCAN_TYPES.contains(x.getLastScanType()))
+                .filter(x -> WarehouseServiceImpl.costRank(x.getReceiptUnitCost(), price) < 2)
+                .sorted(Comparator.comparingInt((WarehouseInventoryItem x) -> WarehouseServiceImpl.costRank(x.getReceiptUnitCost(), price))
-                .sorted(Comparator.comparing(WarehouseInventoryItem::getCreated, Comparator.nullsFirst(Comparator.naturalOrder())))
+                        .thenComparing(WarehouseInventoryItem::getCreated, Comparator.nullsFirst(Comparator.naturalOrder())))
                 .map(WarehouseInventoryItem::getSerialNumber)
                 .collect(Collectors.toCollection(ArrayList::new));
+    }
-    private int billableLotQuantity(int itemId, int vendorWarehouseId) {
+    private int billableLotQuantity(int itemId, int vendorWarehouseId, Float price) {
         return warehouseInventoryItemRepository.selectBillableStock(itemId, vendorWarehouseId).stream()
                 .filter(x -> x.getCurrentQuantity() > 0)
+                .filter(x -> WarehouseServiceImpl.costRank(x.getReceiptUnitCost(), price) < 2)
                 .mapToInt(WarehouseInventoryItem::getCurrentQuantity).sum();
+    }
     // A vendor warehouse the source bills from: its own OURS/GOOD stock, not the Dummy phantom target.
     private boolean isRealVendorWarehouse(Integer warehouseId, int sourceWarehouseId, Map<Integer, InventoryWarehouse> cache) {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementBiller.java – Rev 37828 → 37831