Resolve conflicts

hmislk · Feb 19, 2025 · a43b9d7 · a43b9d7
1 parent 38e8b84
commit a43b9d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java b/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java
@@ -129,7 +129,7 @@ public boolean isFullyIssued(Bill bill) {
         for (BillItem originalItem : billItems) {
 
             if (originalItem.getPharmaceuticalBillItem().getQty() > 0) {
-                return false; 
+                return false;
             }else if(originalItem.getPharmaceuticalBillItem().getItemBatch() == null){
                 return false;
             }
@@ -487,7 +487,7 @@ public void settleDirectIssue() {
                 //Addinng Staff
 //                System.out.println("//Addinng Staff = ");
                 System.out.println(i.getPharmaceuticalBillItem() + " 1 " + i.getPharmaceuticalBillItem().getQtyInUnit() + " " + getIssuedBill().getToStaff());
-                Stock staffStock = pharmacyBean.addToStockWihtoutStockHistory(i.getPharmaceuticalBillItem(),
+                Stock staffStock = pharmacyBean.addToStock(i.getPharmaceuticalBillItem(),
                         Math.abs(i.getPharmaceuticalBillItem().getQtyInUnit()), getIssuedBill().getToStaff());
 
                 i.getPharmaceuticalBillItem().setStaffStock(staffStock);
@@ -611,7 +611,7 @@ public void settle() {
             if (returnFlag) {
 
                 //Addinng Staff
-                Stock staffStock = pharmacyBean.addToStockWihtoutStockHistory(i.getPharmaceuticalBillItem(),
+                Stock staffStock = pharmacyBean.addToStock(i.getPharmaceuticalBillItem(),
                         Math.abs(i.getPharmaceuticalBillItem().getQtyInUnit()), getIssuedBill().getToStaff());
 
                 i.getPharmaceuticalBillItem().setStaffStock(staffStock);
@@ -639,7 +639,7 @@ public void settle() {
 
         getIssuedBill().setFromInstitution(getSessionController().getInstitution());
         getIssuedBill().setFromDepartment(getSessionController().getDepartment());
-        
+
         getIssuedBill().setToInstitution(getRequestedBill().getFromInstitution());
         getIssuedBill().setToDepartment(getRequestedBill().getFromDepartment());
 

diff --git a/src/main/java/com/divudi/bean/pharmacy/TransferReceiveController.java b/src/main/java/com/divudi/bean/pharmacy/TransferReceiveController.java
@@ -126,7 +126,7 @@ public void setIssuedBill(Bill issuedBill) {
         generateBillComponent();
     }
 
-//   public String navigateBackToRecieveList(){    
+//   public String navigateBackToRecieveList(){
 //        return "/pharmacy/pharmacy_transfer_issued_list_with_approval?faces-redirect=true";
 //    }
     public String navigateToRecieveIssue() {
@@ -183,7 +183,7 @@ public boolean isAlreadyReceived(Bill bill) {
         if (bill.getForwardReferenceBills() == null || bill.getForwardReferenceBills().isEmpty()) {
             return false;
         }
-        return true; 
+        return true;
     }
 
     public void settle() {
@@ -224,7 +224,7 @@ public void settle() {
             double qty = Math.abs(i.getPharmaceuticalBillItem().getQtyInUnit());
 
             //    Deduct Staff Stock
-            boolean returnFlag = getPharmacyBean().deductFromStockWithoutStockHistory(tmpPh, Math.abs(qty), getIssuedBill().getToStaff());
+            boolean returnFlag = getPharmacyBean().deductFromStock(tmpPh, Math.abs(qty), getIssuedBill().getToStaff());
 
             if (returnFlag) {
                 //     Add Stock To Department