diff --git a/AstuteSystem/src/main/java/com/astute/service/InvoiceService.java b/AstuteSystem/src/main/java/com/astute/service/InvoiceService.java index 175bb5a..d49cad1 100644 --- a/AstuteSystem/src/main/java/com/astute/service/InvoiceService.java +++ b/AstuteSystem/src/main/java/com/astute/service/InvoiceService.java @@ -32,10 +32,10 @@ public class InvoiceService extends Service{ public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, - double percentCompletion, double hours, double amount) + double qty, double fee) throws AstuteException { getDao().updateInvoiceDetail(invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, desc, - percentCompletion, hours, amount); + qty, fee); } public void createInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum, @@ -45,10 +45,10 @@ public class InvoiceService extends Service{ } public void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, - double percentCompletion, double hours, double amount) + double qty, double fee) throws AstuteException { getDao().createInvoiceDetail(invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, desc, - percentCompletion, hours, amount); + qty, fee); } public GeneratedInvoice getGeneratedInvoice(String invoiceNumber) diff --git a/AstuteSystem/src/main/java/com/astute/service/POService.java b/AstuteSystem/src/main/java/com/astute/service/POService.java index 2f29dfd..be4b96f 100644 --- a/AstuteSystem/src/main/java/com/astute/service/POService.java +++ b/AstuteSystem/src/main/java/com/astute/service/POService.java @@ -15,9 +15,9 @@ public class POService extends Service{ super(); } - public List getPOMaster(String PONum, String contractNum, Date PODate) + public List getPOMaster(String PONum, String contractNum, Date PODate, String astuteProjectNumber) throws AstuteException { - return getDao().getPOMaster(PONum, contractNum, PODate); + return getDao().getPOMaster(PONum, contractNum, PODate, astuteProjectNumber); } public List getPODetail(String PONum, int lineItemNo) @@ -27,24 +27,24 @@ public class POService extends Service{ } - public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt) + public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, String astuteProjectNumber) throws AstuteException { - getDao().updatePOMaster(PONum, contractNum, PODate, contractAmt); + getDao().updatePOMaster(PONum, contractNum, PODate, contractAmt, astuteProjectNumber); } - public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId) + public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId) throws AstuteException { - getDao().updatePODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, serviceTypeId); + getDao().updatePODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, fee, serviceTypeId); } - public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, Integer customerId) + public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, Integer customerId, String astuteProjectNumber) throws AstuteException { - getDao().createPOMaster(PONum, contractNum, PODate, contractAmt, customerId); + getDao().createPOMaster(PONum, contractNum, PODate, contractAmt, customerId, astuteProjectNumber); } - public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId) + public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId) throws AstuteException { - getDao().createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, serviceTypeId); + getDao().createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, fee, serviceTypeId); }