Skip to content

Fix incorrect wholesale value calculation from unrounded batch rate #22052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
buddhika75 merged 1 commit into from
Jul 12, 2026
Merged

Fix incorrect wholesale value calculation from unrounded batch rate #22052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/main/java/com/divudi/bean/pharmacy/WholesaleSaleNativeSqlController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,9 +785,15 @@ public void addBillItem() {
bid.setFreeQty(0.0);
// For wholesale sale, retailRate/batchRetailRate are kept as bookkeeping metadata
// (from the batch lookup); the actual charged rate comes from wholesaleRate.
// The charged rate is rounded to currency precision (2dp) so the displayed Rate
// and the calculated Value always agree (ItemBatch.wholesaleRate is frequently
// stored with more than 2 decimal places, e.g. 8.4564 - issue #21912).
double lineWholesaleRate = CommonFunctions.round(
stockDto.getWholesaleRate() != null ? stockDto.getWholesaleRate() : 0.0);

bid.setRetailRate(batchRetailRate);
bid.setPurchaseRate(batchPurchaseRate);
bid.setWholesaleRate(stockDto.getWholesaleRate() != null ? stockDto.getWholesaleRate() : 0.0);
bid.setWholesaleRate(lineWholesaleRate);
bid.setCostRate(batchCostRate != null ? batchCostRate : batchPurchaseRate);
bid.setBatchRetailRate(batchRetailRate);
bid.setBatchPurchaseRate(batchPurchaseRate);
Expand All @@ -798,7 +804,6 @@ public void addBillItem() {
bid.setCreatedAt(new Date());
bid.setCreaterId(sessionController.getLoggedUser().getId());

double lineWholesaleRate = stockDto.getWholesaleRate() != null ? stockDto.getWholesaleRate() : 0.0;
double grossValue = lineWholesaleRate * qty;
double discountPct = 0.0;
double discountValue = 0.0;
Expand Down Expand Up @@ -1081,10 +1086,13 @@ public void replaceSelectedSubstitute() {
bid.setItemBatchId(sub.getItemBatchId());
bid.setPbiQty(-Math.abs(qty));
// For wholesale sale, retailRate/batchRetailRate are kept as bookkeeping metadata;
// the actual charged rate comes from the substitute's wholesaleRate.
// the actual charged rate comes from the substitute's wholesaleRate, rounded to
// currency precision so the displayed Rate and calculated Value agree (#21912).
double lineWholesaleRate = CommonFunctions.round(batchWholesaleRate);

bid.setRetailRate(batchRetailRate);
bid.setPurchaseRate(batchPurchaseRate);
bid.setWholesaleRate(batchWholesaleRate);
bid.setWholesaleRate(lineWholesaleRate);
bid.setCostRate(batchCostRate != null ? batchCostRate : batchPurchaseRate);
bid.setBatchRetailRate(batchRetailRate);
bid.setBatchPurchaseRate(batchPurchaseRate);
Expand All @@ -1093,7 +1101,6 @@ public void replaceSelectedSubstitute() {
bid.setDoe(sub.getDateOfExpire());
bid.setDescription(sub.getItemName());

double lineWholesaleRate = batchWholesaleRate;
double grossValue = lineWholesaleRate * qty;
double discountPct = 0.0;
double discountValue = 0.0;
Expand Down Expand Up @@ -1189,7 +1196,8 @@ public void calculateDobFromAge() {

public void calculateBillItemListner() {
if (stockDto != null && intQty != null) {
double rate = stockDto.getWholesaleRate() != null ? stockDto.getWholesaleRate() : 0.0;
double rate = CommonFunctions.round(
stockDto.getWholesaleRate() != null ? stockDto.getWholesaleRate() : 0.0);
getBillItem().setRate(rate);
getBillItem().setNetRate(rate);
getBillItem().setNetValue(rate * intQty);
Expand Down Expand Up @@ -1641,12 +1649,13 @@ public void setToStaff(Staff toStaff) {

public Double getPreviewRate() {
if (stockDto == null) return null;
return stockDto.getWholesaleRate();
return stockDto.getWholesaleRate() != null ? CommonFunctions.round(stockDto.getWholesaleRate()) : null;
}

public Double getPreviewNetValue() {
if (stockDto == null || intQty == null) return null;
double rate = stockDto.getWholesaleRate() != null ? stockDto.getWholesaleRate() : 0.0;
double rate = CommonFunctions.round(
stockDto.getWholesaleRate() != null ? stockDto.getWholesaleRate() : 0.0);
return rate * intQty;
}

Expand Down
Loading