From 1ba9c9972161c40eb9cf04e5f4f0269cc8bfa695 Mon Sep 17 00:00:00 2001
From: gopi17701 <41270090+gopi17701@users.noreply.github.com>
Date: Wed, 15 Aug 2018 14:49:14 -0400
Subject: [PATCH] Add files via upload

---
 AstuteSystem/src/main/java/com/astute/dao/DAO.java |  4 ++--
 .../src/main/java/com/astute/dao/SqlDAO.java       | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/AstuteSystem/src/main/java/com/astute/dao/DAO.java b/AstuteSystem/src/main/java/com/astute/dao/DAO.java
index e17c6e8..981d7fc 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/DAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/DAO.java
@@ -98,11 +98,11 @@ public abstract class DAO {
 
     public abstract void updatePOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, String astuteProjectNumber) throws AstuteException;
 
-    public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId) throws AstuteException;
+    public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException;
 
     public abstract void createPOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, String customerId, String astuteProjectNumber) throws AstuteException;
 
-    public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId) throws AstuteException;
+    public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException;
 
 
     public abstract List<Invoice> getInvoiceMaster(String invoiceNumber, int pmtStatus) throws AstuteException;
diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
index 5af21db..88e8549 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
@@ -75,7 +75,7 @@ public class SqlDAO extends DAO {
             Statement stmt = conn.createStatement();
             String whereClause = " WHERE ";
             boolean whereClauseCriteria = false;
-            String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, fee, service_type_id, get_remaining_qty_fun(PO_num, line_item_no) as get_remaining_qty FROM PO_DETAIL ";
+            String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, fee, service_type_id, remaining_qty FROM PO_DETAIL ";
             if (PONum != null) {
                 whereClause = whereClause + " UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
                 whereClauseCriteria = true;
@@ -142,7 +142,7 @@ public class SqlDAO extends DAO {
 
     }
 
-    public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId) throws AstuteException {
+    public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException {
         try {
 
             String sql = "UPDATE PO_DETAIL ";
@@ -160,13 +160,15 @@ public class SqlDAO extends DAO {
             List<PODetail> lineItem = getPODetail(POnum, lineItemNo);
             if (lineItem.size() == 0) {
                 // new line item
-                createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, fee, serviceTypeId);
+                createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, fee, serviceTypeId, remainingQuantity);
             } else {
                 updateClause += " service_desc = '" + serviceDesc + "',";
                 updateClause += " fee_type_id = " + feeTypeId + ",";
                 updateClause += " qty = " + qty + ",";
                 updateClause += " fee = " + fee + ",";
                 updateClause += " service_type_id = " + serviceTypeId + ",";
+                updateClause += " remaining_qty = " + remainingQuantity + ",";
+
                 if (!updateClause.equalsIgnoreCase(" SET ")) {
                     sql = sql + trimLastCharacter(updateClause, ",") + whereClause;
 
@@ -199,11 +201,11 @@ public class SqlDAO extends DAO {
         }
     }
 
-    public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId) throws AstuteException {
+    public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException {
         try {
             System.out.println("Calling create_po_detail Procedure");
             System.out.println("POnum is " + POnum);
-            CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?,?)}");
+            CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?,?,?)}");
             stmt.setString(1, POnum);
             stmt.setInt(2, lineItemNo);
             stmt.setString(3, serviceDesc);
@@ -211,6 +213,8 @@ public class SqlDAO extends DAO {
             stmt.setDouble(5, qty);
             stmt.setDouble(6, fee);
             stmt.setInt(7, serviceTypeId);
+            stmt.setDouble(8, remainingQuantity);
+
             stmt.executeUpdate();
         } catch (SQLException e) {
             e.printStackTrace();