Skip to content

B
business-java
Commit 6811e926 authored by ngadkari's avatar ngadkari
Browse files
Options

removed sreturndet join with min_rate_history table 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203661 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 444fbe89
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 8 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 6811e926
......@@ -3326,6 +3326,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
unitStd = genericUtility.getColumnValue("unit__std", dom);
retReplFlag = genericUtility.getColumnValue("ret_rep_flag", dom);
String iValStr = genericUtility.getColumnValue("line_no__inv", dom);
sQuantity=checkDoubleNull(genericUtility.getColumnValue("quantity__stduom", dom));//added by nandkumar gadkari on 18/07/19
if (iValStr != null && iValStr.indexOf(".") > 0)
{
iValStr = iValStr.substring(0,iValStr.indexOf("."));
......@@ -3474,7 +3475,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
slineNo = genericUtility.getColumnValue("line_no", dom);
//lineNo = Integer.parseInt(slineNo);
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
//sql commented by nandkumar gadkari on 18/04/19
/*sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET"
//Changed by Santosh on 16/05/2017
......@@ -3489,12 +3492,22 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"
//Changed by Santosh on 23/05/2017 to avoid sql exception if SRETURN_ADJ_OPT value is other than ('E', 'L', 'M')
//+ " ORDER BY "+orderByStr;
*/ //sql added for remove join with sreturnDet table by nandkumar gadkari on 18/07/19
sql =" SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH "
+ " WHERE MRH.CUST_CODE = ?"
+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END >= ? "
+ " AND MRH.QUANTITY IS NOT NULL"
+ " GROUP BY MRH.INVOICE_ID, MRH.QUANTITY, MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ "
+ orderByStr;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
pstmt.setString(2, itemCode);
pstmt.setString(3, lotNo);
pstmt.setString(4, siteCode);
pstmt.setDouble(5, sQuantity);// added by nandkumar gadkari on 18/07/19
rs = pstmt.executeQuery();
while(rs.next())
......@@ -3821,8 +3834,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
minRateDocKey = dokkeyList.get(i);
System.out.println("@@@@@@@minRateDocKey ..........[" + minRateDocKey+"]");
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
//sql commented by nandkumar gadkari on 18/04/19
/*sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET"
+ " WHERE MRH.DOC_KEY =SRDET.DOC_KEY(+) AND MRH.CUST_CODE = ?"
......@@ -3830,7 +3843,16 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END > 0"
+ " AND MRH.QUANTITY IS NOT NULL AND MRH.DOC_KEY = ? "
+ " GROUP BY MRH.INVOICE_ID, MRH.QUANTITY, MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE"
+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"
+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"*/
//sql added for remove join with sreturnDet table by nandkumar gadkari on 18/07/19
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH "
+ " WHERE MRH.CUST_CODE = ?"
+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END > 0"
+ " AND MRH.QUANTITY IS NOT NULL AND MRH.DOC_KEY = ? "
+ " GROUP BY MRH.INVOICE_ID, MRH.QUANTITY, MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ "
+ orderByStr;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
......@@ -4977,7 +4999,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.close();
pstmt = null;
if( lsInvoiceItem != null && lsInvoiceItem.trim().equals(mcode.trim() ) && lsInvoiceId.trim().length() > 0 )
if(lsInvoiceId != null && lsInvoiceItem != null && lsInvoiceItem.trim().equals(mcode.trim() ) && lsInvoiceId.trim().length() > 0 )
{
valueXmlString.append("<stk_opt>").append("<![CDATA[" + "N" + "]]>").append("</stk_opt>");
setNodeValue( dom, "stk_opt", "N" );
......@@ -6206,7 +6228,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
minRateDocKey = dokkeyList.get(0);
System.out.println("@@@@@@@minRateDocKey .......... test 123 [" + minRateDocKey+"]");
System.out.println("@@@@@@@count1 .......... test 123");
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
/*sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET"
+ " WHERE MRH.DOC_KEY =SRDET.DOC_KEY(+) AND MRH.CUST_CODE = ?"
......@@ -6214,7 +6236,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END > 0"
+ " AND MRH.QUANTITY IS NOT NULL AND MRH.INVOICE_ID= ? "
+ " GROUP BY MRH.INVOICE_ID, MRH.QUANTITY, MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE"
+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"
+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"*/
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH "
+ " WHERE MRH.CUST_CODE = ?"
+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END > 0"
+ " AND MRH.QUANTITY IS NOT NULL AND MRH.INVOICE_ID= ? "
+ " GROUP BY MRH.INVOICE_ID, MRH.QUANTITY, MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ "
+ orderByStr;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
......@@ -11258,7 +11288,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
return input;
}
private double checkDoubleNull(String input)
{
double var=0.0;
if (input != null && input.trim().length() > 0)
{
var =Double.parseDouble(input);
}
return var;
}
private double getTotAmt(Document dom) throws Exception
{
/* 05/03/108 manoharan
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment