Closes #4634

Signed-off-by: Senula88 <[email protected]>
hmislk · Apr 19, 2024 · 88f7c4d · 88f7c4d
1 parent e657856
commit 88f7c4d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java
@@ -3454,10 +3454,6 @@ public void createNotApproved(InstitutionType institutionType, BillType bt) {
                 + " and b.billType= :bTp ";
 
         sql += createKeySql(tmp);
-        if (getSearchKeyword().getRefBillNo() != null && !getSearchKeyword().getRefBillNo().trim().equals("")) {
-            sql += " and  ((b.deptId) like :billNo )";
-            tmp.put("billNo", "%" + getSearchKeyword().getRefBillNo().trim().toUpperCase() + "%");
-        }
         sql += " order by b.createdAt desc  ";
 
         List<Bill> lst3 = getBillFacade().findByJpql(sql, tmp, TemporalType.TIMESTAMP, maxResult);

diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java
@@ -44,6 +44,7 @@
 import com.divudi.facade.ItemBatchFacade;
 import com.divudi.facade.PharmaceuticalBillItemFacade;
 import com.divudi.bean.common.util.JsfUtil;
+import com.divudi.data.BillTypeAtomic;
 import com.divudi.java.CommonFunctions;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -522,6 +523,7 @@ public String cancelPoBill() {
             CancelledBill cancellationBill = pharmacyCreateCancelBill();
             cancellationBill.setDeptId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getDepartment(), BillType.PharmacyPurchaseBill, BillClassType.CancelledBill, BillNumberSuffix.GRNCAN));
             cancellationBill.setInsId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getInstitution(), BillType.PharmacyPurchaseBill, BillClassType.CancelledBill, BillNumberSuffix.GRNCAN));
+            cancellationBill.setBillTypeAtomic(BillTypeAtomic.MULTIPLE_PHARMACY_ORDER_CANCELLED_BILL);
 
             if (cancellationBill.getId() == null) {
                 getBillFacade().create(cancellationBill);

diff --git a/src/main/java/com/divudi/data/BillTypeAtomic.java b/src/main/java/com/divudi/data/BillTypeAtomic.java
@@ -56,6 +56,7 @@ public enum BillTypeAtomic {
     PHARMACY_ISSUE_CANCELLED("Pharmacy Issue Cancelled", BillCategory.CANCELLATION, ServiceType.PHARMACY, BillFinanceType.NO_FINANCE_TRANSACTIONS),
     PHARMACY_RECEIVE("Pharmacy Receive", BillCategory.BILL, ServiceType.PHARMACY, BillFinanceType.NO_FINANCE_TRANSACTIONS),
     PHARMACY_RECEIVE_CANCELLED("Pharmacy Receive Cancelled", BillCategory.CANCELLATION, ServiceType.PHARMACY, BillFinanceType.NO_FINANCE_TRANSACTIONS),
+    MULTIPLE_PHARMACY_ORDER_CANCELLED_BILL("Multiple Pharmacy Purchase Order Cancelled", BillCategory.CANCELLATION, ServiceType.PHARMACY, BillFinanceType.NO_FINANCE_TRANSACTIONS),
     // CHANNELLING
     CHANNEL_BOOKING_WITH_PAYMENT("Channel Booking and Payment", BillCategory.BILL, ServiceType.CHANNELLING, BillFinanceType.CASH_IN),
     CHANNEL_BOOKING_WITHOUT_PAYMENT("Channel Booking without Payment", BillCategory.BILL, ServiceType.CHANNELLING, BillFinanceType.NO_FINANCE_TRANSACTIONS),

diff --git a/src/main/java/com/divudi/data/Icon.java b/src/main/java/com/divudi/data/Icon.java
@@ -84,6 +84,7 @@ public enum Icon {
     Goods_Receipt("Goods Receipt"),
     Return_Received_Goods("Return Received Goods"),
     Return_without_Receipt("Return without Receipt"),
+    Multiple_Purchase_Order_Cancellation("Multiple Purchase Order Cancellation"),
 
     pharmacy_issue("Pharmacy - Issue"),
     pharmacy_search_issue_bill("Pharmacy - Search Issue Bill"),

diff --git a/src/main/webapp/home.xhtml b/src/main/webapp/home.xhtml
@@ -1035,6 +1035,21 @@
                         </p:commandLink>
                     </h:form>
                 </h:panelGroup>
+
+                <!-- Multiple Purchase Order Cancellation -->
+                <h:panelGroup layout="block" class="col-1 m-3" rendered="#{ui.icon eq 'Multiple_Purchase_Order_Cancellation'}">
+                    <h:form>
+                        <p:tooltip for="Multiple_Purchase_Order_Cancellation" value="Multiple Purchase Order Cancellation"  showDelay="0" hideDelay="0"></p:tooltip>
+                        <p:commandLink 
+                            id="Multiple_Purchase_Order_Cancellation"
+                            ajax="false" 
+                            action="#{searchController.navigateToCancelPurchaseOrder()}"
+                            styleClass="svg-link" >
+                            <p:graphicImage library="image" name="home/ban-solid.svg" style="cursor: pointer;" width="80" height="80"/>
+                            <h:outputText style="display: none;" value="Multiple Purchase Order Cancellation" />
+                        </p:commandLink>
+                    </h:form>
+                </h:panelGroup>
 
 
                 <!-- Pharmacy Issue -->

diff --git a/src/main/webapp/resources/image/home/ban-solid.svg b/src/main/webapp/resources/image/home/ban-solid.svg