From 3d38651747e0e286077299a513f37e08903ed6e1 Mon Sep 17 00:00:00 2001
From: Gopi Katwala <GopiKatwala@gmail.com>
Date: Tue, 16 Jul 2019 21:03:31 -0400
Subject: [PATCH] * Created deleteInvoiceDetail and deletePODetail Angular
 service methods. * Web Service - Took out Invoice Detail remaining qty check
 from WS code. It will be handled in Front end now.

---
 .../src/app/services/astute-client-service.ts | 47 +++++++++++++++++++
 .../src/main/java/com/astute/dao/SqlDAO.java  | 29 ++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/AstuteClient2/src/app/services/astute-client-service.ts b/AstuteClient2/src/app/services/astute-client-service.ts
index 23f4591..1a10147 100644
--- a/AstuteClient2/src/app/services/astute-client-service.ts
+++ b/AstuteClient2/src/app/services/astute-client-service.ts
@@ -375,6 +375,30 @@ export class AstuteClientService {
                 this.notif(error);
             });
     }
+    public deletePODetail(ponum, lineItemNo) {
+        console.log('*** In deletePODetail()');
+        const sessionId = localStorage.getItem('sessionId');
+        const url = `${this.POUrl}/detail/${ponum}/${lineItemNo}${this.sessionString}`;
+        return this.http.delete(url)
+            .toPromise()
+            .then(response => {
+                const code = response['code'];
+                const message = response['message'];
+                if (code === 9000) {
+                    console.log(response['entity']);
+                    return response['entity'];
+                } else if (message.includes('login')) {
+                    this.notif('Please login again!');
+                } else {
+                    this.notif('Delete Sales Order Details Failed: ' + message);
+                }
+            }, (reason) => {
+                this.notif('Delete Sales Order Details Failed: ' + reason);
+            })
+            .catch( error => {
+                this.notif(error);
+            });
+    }
     public createPODetail(data) {
         console.log('*** In createPODetail()');
         const url = `${this.POUrl}/detail${this.sessionString}`;
@@ -722,6 +746,29 @@ export class AstuteClientService {
                 this.notif(error);
             });
     }
+    public deleteInvoiceDetail(invNum, lineItemNo) {
+        console.log('*** In deleteInvoiceDetail()');
+        const url = `${this.invoiceUrl}/detail/${invNum}/${lineItemNo}${this.sessionString}`;
+        return this.http.delete(url)
+            .toPromise()
+            .then(response => {
+                const code = response['code'];
+                const message = response['message'];
+                if (code === 9000) {
+                    console.log(response['entity']);
+                    return response['entity'];
+                } else if (message.includes('login')) {
+                    this.notif('Please login again!');
+                } else {
+                    this.notif('Delete Invoice Detail Failed: ' + message);
+                }
+            }, (reason) => {
+                this.notif('Delete Invoice Detail Failed: ' + reason);
+            })
+            .catch( error => {
+                this.notif(error);
+            });
+    }
     public createInvoiceDetail(data) {
         console.log('*** In createInvoiceDetail()');
         const url = `${this.invoiceUrl}/detail${this.sessionString}`;
diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
index 87bb0fb..64b9cd7 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
@@ -635,6 +635,31 @@ public class SqlDAO extends DAO {
         }
     }
 
+    public Double getRemainingQty(String poNum, String invoiceNum, int lineItemNo) throws AstuteException {
+        Double remainingQty=0.0;
+        String sql;
+        try {
+            Statement stmt = conn.createStatement();
+            if (!poNum.isEmpty()) {
+                sql = "SELECT remaining_qty FROM PO_DETAIL WHERE po_Num = '" + poNum + "' AND line_item_no = " + lineItemNo;
+            } else {
+                sql = " SELECT remaining_qty FROM PO_DETAIL, INVOICE " +
+                " WHERE invoice.PO_num = po_detail.PO_num " +
+                " AND line_item_no = " + lineItemNo +
+                " AND invoice.inv_no = '" + invoiceNum + "'";
+            }
+            System.out.println(sql);
+            ResultSet rs = stmt.executeQuery(sql);
+            while (rs.next()) {
+                remainingQty = rs.getDouble(1);
+            }
+            return remainingQty;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            throw new AstuteException(DB_ERROR,e.getMessage());
+        }
+    }
+
     public Double updateRemainingQty(String poNum, String invNo, int lineItemNo) throws AstuteException {
         Double remainingQty;
         try {
@@ -654,8 +679,12 @@ public class SqlDAO extends DAO {
         }
         return remainingQty;
     }
+
     public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double qty, double fee, int feeTypeId)throws AstuteException {
         try {
+//            if (qty > getRemainingQty( "",invoiceNum, POLineItemNum)) {
+//                throw new AstuteException(DB_ERROR,"Qty can not exceed Remaining Qty");
+//            }
             String sql = "UPDATE INVOICE_DETAIL ";
             String updateClause = " SET ";
             String whereClause = "";