From b92de8a9362c3fb247bef0c0c1238fbfda20a09d Mon Sep 17 00:00:00 2001
From: gopi17701 <41270090+gopi17701@users.noreply.github.com>
Date: Mon, 23 Jul 2018 13:25:40 -0400
Subject: [PATCH] Add files via upload

---
 .../java/com/astute/model/InvoiceDetail.java  | 49 +++++++------------
 .../src/main/java/com/astute/model/PO.java    |  8 ++-
 .../main/java/com/astute/model/PODetail.java  |  8 ++-
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java b/AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java
index 4de9092..49722a7 100644
--- a/AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java
+++ b/AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java
@@ -1,23 +1,22 @@
 package com.astute.model;
 
 public class InvoiceDetail {
-    String  invoiceNum;
-    int     lineItemNum;
-    int     poLineItemNum;
-    int     serviceTypeId;
-    String  desc;
-    double  percentCompletion;
-    double  hours;
-    double  anount;
-    public InvoiceDetail(String invoiceNum, int lineItemNum, int poLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double anount) {
+    String invoiceNum;
+    int lineItemNum;
+    int poLineItemNum;
+    int serviceTypeId;
+    String desc;
+    double qty;
+    double fee;
+
+    public InvoiceDetail(String invoiceNum, int lineItemNum, int poLineItemNum, int serviceTypeId, String desc, double qty, double fee) {
         this.invoiceNum = invoiceNum;
         this.lineItemNum = lineItemNum;
         this.poLineItemNum = poLineItemNum;
         this.serviceTypeId = serviceTypeId;
         this.desc = desc;
-        this.percentCompletion = percentCompletion;
-        this.hours = hours;
-        this.anount = anount;
+        this.qty = qty;
+        this.fee = fee;
     }
 
     public String getInvoiceNum() {
@@ -60,29 +59,19 @@ public class InvoiceDetail {
         this.desc = desc;
     }
 
-    public double getPercentCompletion() {
-        return percentCompletion;
+    public double getQty() {
+        return qty;
     }
 
-    public void setPercentCompletion(double percentCompletion) {
-        this.percentCompletion = percentCompletion;
+    public void setQty(double qty) {
+        this.qty = qty;
     }
 
-    public double getHours() {
-        return hours;
+    public double getFee() {
+        return fee;
     }
 
-    public void setHours(double hours) {
-        this.hours = hours;
+    public void setFee(double fee) {
+        this.fee = fee;
     }
-
-    public double getAnount() {
-        return anount;
-    }
-
-    public void setAnount(double anount) {
-        this.anount = anount;
-    }
-
-
 }
\ No newline at end of file
diff --git a/AstuteSystem/src/main/java/com/astute/model/PO.java b/AstuteSystem/src/main/java/com/astute/model/PO.java
index 652d66d..0cb64c2 100644
--- a/AstuteSystem/src/main/java/com/astute/model/PO.java
+++ b/AstuteSystem/src/main/java/com/astute/model/PO.java
@@ -10,6 +10,7 @@ public class PO implements Serializable{
     private Date           PODate;
     private Double         contractAmt;
     private Integer        customerId;
+    private String         astuteProjectNumber;
 
     public PO(String PONum, String contractNum, Date PODate, Integer customerId, Double contractAmt) {
         this.PONum = PONum;
@@ -62,6 +63,11 @@ public class PO implements Serializable{
         this.customerId = customerId;
     }
 
+    public String getAstuteProjectNumber() {
+        return astuteProjectNumber;
+    }
 
-
+    public void setAstuteProjectNumber(String astuteProjectNumber) {
+        this.astuteProjectNumber = astuteProjectNumber;
+    }
 }
\ No newline at end of file
diff --git a/AstuteSystem/src/main/java/com/astute/model/PODetail.java b/AstuteSystem/src/main/java/com/astute/model/PODetail.java
index 48985be..4bf7215 100644
--- a/AstuteSystem/src/main/java/com/astute/model/PODetail.java
+++ b/AstuteSystem/src/main/java/com/astute/model/PODetail.java
@@ -9,15 +9,17 @@ public class PODetail implements Serializable{
     String serviceDesc;
     int feeTypeId;
     Double qty;
+    Double fee;
     int serviceTypeId;
     Double remainingQty;
 
-    public PODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, Double remainingQty) {
+    public PODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, double fee, int serviceTypeId, Double remainingQty) {
         this.POnum = POnum;
         this.lineItemNo = lineItemNo;
         this.serviceDesc = serviceDesc;
         this.feeTypeId = feeTypeId;
         this.qty = qty;
+        this.fee = fee;
         this.serviceTypeId = serviceTypeId;
         this.remainingQty = remainingQty;
     }
@@ -62,6 +64,10 @@ public class PODetail implements Serializable{
         this.qty = qty;
     }
 
+    public Double getFee() { return fee; }
+
+    public void setFee(Double fee) { this.fee = fee; }
+
     public int getServiceTypeId() {
         return serviceTypeId;
     }