Commit d2a26d1f authored by ngadkari's avatar ngadkari

changes in sales return inv_ref column itemChange

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@192074 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3b9dd520
...@@ -3411,13 +3411,29 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3411,13 +3411,29 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
int size = dokkeyList.size(); int size = dokkeyList.size();
System.out.println("dokkk key size: " +size); System.out.println("dokkk key size: " +size);
/*for(int i=0;i<=size-1;i++) for(int i=0;i<=1;i++)
{*/ {
minRateDocKey = dokkeyList.get(0); cnt=0;
minRateDocKey = dokkeyList.get(i);
/*if(lineNo > 1) /*if(lineNo > 1)
{ {
*/ //Changed by Santosh on 16/05/2017 as invoiceId is not set on itemchange */ //Changed by Santosh on 16/05/2017 as invoiceId is not set on itemchange
//invoiceId = getAvailableInvId(dom2, curFormItemLotHMap, curRecordItemLotHMap, invoiceId, adjQty); //invoiceId = getAvailableInvId(dom2, curFormItemLotHMap, curRecordItemLotHMap, invoiceId, adjQty);
String docKeyvalue="";
if (minRateDocKey.trim().length() > 0) {
String[] docKeyStr = minRateDocKey.split(",");
for(int j=0; j<docKeyStr.length; j++)
{
//System.out.println( "docKeyStr :: " + docKeyStr[j]);
System.out.println( "docKeyStrlength :: " + docKeyStr.length);
cnt++;
}
}
System.out.println( "cnt :: " + cnt );
if(cnt ==5)
{
sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? AND QUANTITY - CASE WHEN QUANTITY_ADJ IS NULL THEN 0 ELSE QUANTITY_ADJ END > 0 "; sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? AND QUANTITY - CASE WHEN QUANTITY_ADJ IS NULL THEN 0 ELSE QUANTITY_ADJ END > 0 ";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, minRateDocKey); pstmt1.setString(1, minRateDocKey);
...@@ -3448,12 +3464,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3448,12 +3464,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
break; break;
} }
} }
}
/*} }
if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0) if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0)
{ {
break; break;
}*/// // commented by Nandkumar Gadkari on 15/10/18 }// // commented by Nandkumar Gadkari on 15/10/18
// Changes by Nandkumar Gadkari on 14/09/18--------[end]--------- // Changes by Nandkumar Gadkari on 14/09/18--------[end]---------
} }
if(pstmt != null) if(pstmt != null)
...@@ -3508,8 +3524,24 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3508,8 +3524,24 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
int size = dokkeyList.size(); int size = dokkeyList.size();
System.out.println("dokkk key size: " +size); System.out.println("dokkk key size: " +size);
for(int i=1;i<=size-1;i++) for(int i=1;i<=size-1;i++)
{ {
cnt=0;
minRateDocKey = dokkeyList.get(i); minRateDocKey = dokkeyList.get(i);
String docKeyvalue="";
if (minRateDocKey.trim().length() > 0) {
String[] docKeyStr = minRateDocKey.split(",");
for(int j=0; j<docKeyStr.length; j++)
{
System.out.println( "docKeyStr :: " + docKeyStr[j]);
System.out.println( "docKeyStrlength :: " + docKeyStr.length);
cnt++;
}
}
System.out.println( "cnt :: " + cnt );
if(cnt !=5)
{
sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? "; sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? ";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, minRateDocKey); pstmt1.setString(1, minRateDocKey);
...@@ -3540,7 +3572,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3540,7 +3572,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
break; break;
} }
} }
}
} }
if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0) if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0)
{ {
......
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