Skip to content

⚡ Refactor pharmacy cancel items to bulk batch inserts #13

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
ManupaKDU merged 1 commit into from
Jun 12, 2026
Merged

⚡ Refactor pharmacy cancel items to bulk batch inserts #13

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
81 changes: 59 additions & 22 deletions src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,12 @@ private void pharmacyCancelBillItemsReduceStock(CancelledBill can) {
}

private void pharmacyCancelBillItemsReduceStock(CancelledBill cancellationBill, Payment p) {
List<BillItem> newItems = new ArrayList<>();
List<BillItem> origItems = new ArrayList<>();
List<Long> origItemIds = new ArrayList<>();

for (BillItem originalBillItem : getBill().getBillItems()) {
origItemIds.add(originalBillItem.getId());
BillItem newlyCreatedBillItemForCancelBill = new BillItem();
newlyCreatedBillItemForCancelBill.setBill(cancellationBill);
newlyCreatedBillItemForCancelBill.copy(originalBillItem);
Expand Down Expand Up @@ -2116,41 +2121,68 @@ private void pharmacyCancelBillItemsReduceStock(CancelledBill cancellationBill,
ph.setCostValue(-Math.abs(totalQtyInUnits * costRatePerUnit));
ph.setRetailValue(-Math.abs(totalQtyInUnits * retailRatePerUnit));

// getPharmaceuticalBillItemFacade().create(ph);
newlyCreatedBillItemForCancelBill.setPharmaceuticalBillItem(ph);

ph.setBillItem(newlyCreatedBillItemForCancelBill);
// getPharmaceuticalBillItemFacade().edit(ph);

if (newlyCreatedBillItemForCancelBill.getId() == null) {
getBillItemFacade().create(newlyCreatedBillItemForCancelBill);
} else {
getBillItemFacade().edit(newlyCreatedBillItemForCancelBill);
newItems.add(newlyCreatedBillItemForCancelBill);
origItems.add(originalBillItem);
cancellationBill.getBillItems().add(newlyCreatedBillItemForCancelBill);
}

if (!newItems.isEmpty()) {
getBillItemFacade().batchCreate(newItems);
}

Map<Long, List<BillFee>> origItemToFeesMap = new HashMap<>();
if (!origItemIds.isEmpty()) {
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id IN :ids";
Map<String, Object> params = new HashMap<>();
params.put("ids", origItemIds);
List<BillFee> allFees = getBillFeeFacade().findByJpql(sql, params);
for (BillFee fee : allFees) {
if (fee.getBillItem() != null) {
Long id = fee.getBillItem().getId();
List<BillFee> feesForId = origItemToFeesMap.get(id);
if (feesForId == null) {
feesForId = new ArrayList<>();
origItemToFeesMap.put(id, feesForId);
}
feesForId.add(fee);
}
}
}

List<BillItem> itemsToEdit = new ArrayList<>();
List<PharmaceuticalBillItem> phItemsToEdit = new ArrayList<>();

for (int i = 0; i < newItems.size(); i++) {
BillItem newlyCreatedBillItemForCancelBill = newItems.get(i);
BillItem originalBillItem = origItems.get(i);
PharmaceuticalBillItem ph = newlyCreatedBillItemForCancelBill.getPharmaceuticalBillItem();

// updateRemainingQty(nB);
// b.setPharmaceuticalBillItem(b.getReferanceBillItem().getPharmaceuticalBillItem());
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
//System.err.println("Updating QTY " + qty);
boolean returnFlag = getPharmacyBean().deductFromStock(ph.getStock(), Math.abs(qty), ph, getSessionController().getDepartment());

if (!returnFlag) {
newlyCreatedBillItemForCancelBill.setTmpQty(0);
getPharmaceuticalBillItemFacade().edit(newlyCreatedBillItemForCancelBill.getPharmaceuticalBillItem());
phItemsToEdit.add(ph);
}

List<BillFee> tmp = origItemToFeesMap.get(originalBillItem.getId());
if (tmp == null) {
tmp = new ArrayList<>();
}
//get billfees from using cancel billItem
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + originalBillItem.getId();
List<BillFee> tmp = getBillFeeFacade().findByJpql(sql);
cancelBillFee(cancellationBill, newlyCreatedBillItemForCancelBill, tmp);

//create BillFeePayments For cancel
sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + newlyCreatedBillItemForCancelBill.getId();
List<BillFee> tmpC = getBillFeeFacade().findByJpql(sql);
// calculateBillfeePaymentsForCancelRefundBill(tmpC, p);
//
getBillItemFacede().edit(newlyCreatedBillItemForCancelBill);
itemsToEdit.add(newlyCreatedBillItemForCancelBill);
}

cancellationBill.getBillItems().add(newlyCreatedBillItemForCancelBill);
if (!phItemsToEdit.isEmpty()) {
getPharmaceuticalBillItemFacade().batchEdit(phItemsToEdit);
}

if (!itemsToEdit.isEmpty()) {
getBillItemFacede().batchEdit(itemsToEdit);
}

getBillFacade().edit(cancellationBill);
Expand Down Expand Up @@ -2363,6 +2395,8 @@ private void pharmacyCancelBillItems(CancelledBill newlyCreatedCancellingBill, L
}

private void cancelBillFee(Bill can, BillItem bt, List<BillFee> tmp) {
if (tmp == null || tmp.isEmpty()) return;
List<BillFee> toEdit = new ArrayList<>();
for (BillFee nB : tmp) {
BillFee bf = new BillFee();
bf.setFee(nB.getFee());
Expand All @@ -2381,7 +2415,10 @@ private void cancelBillFee(Bill can, BillItem bt, List<BillFee> tmp) {
bf.setCreatedAt(new Date());
bf.setCreater(getSessionController().getLoggedUser());

getBillFeeFacade().edit(bf);
toEdit.add(bf);
}
if (!toEdit.isEmpty()) {
getBillFeeFacade().batchEdit(toEdit);
}
}

Expand Down
Loading