Commit 2e72c0ca 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@192213 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e342b6c9
...@@ -5970,7 +5970,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5970,7 +5970,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{ {
//Nandkumar Gadkari on 11/10/18--------------------------------------------(Start)--------------------------------- //Nandkumar Gadkari on 11/10/18--------------------------------------------(Start)---------------------------------
boolean isInvRefDateSet = false;
System.out.println(">>>>>>>>>>In IC lot_no:"); System.out.println(">>>>>>>>>>In IC lot_no:");
priceList = genericUtility.getColumnValue("price_list", dom1); priceList = genericUtility.getColumnValue("price_list", dom1);
priceListClg = genericUtility.getColumnValue("price_list__clg", dom1); priceListClg = genericUtility.getColumnValue("price_list__clg", dom1);
...@@ -6134,6 +6134,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -6134,6 +6134,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} }
if(invRefDate != null && invRefDate.trim().length() >0) if(invRefDate != null && invRefDate.trim().length() >0)
{ {
isInvRefDateSet= true;
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>"); valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
} }
} }
...@@ -6621,7 +6622,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -6621,7 +6622,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
System.out.println("inside invoice ref : " ); System.out.println("inside invoice ref : " );
String invRef = checkNull(genericUtility.getColumnValue( "invoice_ref", dom )); String invRef = checkNull(genericUtility.getColumnValue( "invoice_ref", dom ));
invoiceId = genericUtility.getColumnValue("invoice_id", dom1); invoiceId = genericUtility.getColumnValue("invoice_id", dom1);
if((invoiceId == null || "null".equals(invoiceId)|| invoiceId.trim().length() == 0 )&& (invRef.trim().length() > 0 || invRef != null ) ) if((invoiceId == null || "null".equals(invoiceId)|| invoiceId.trim().length() == 0 )&& (invRef.trim().length() > 0 || invRef != null ) && !isInvRefDateSet)
{ {
sqlStr = "select tran_date from invoice where INVOICE_ID = ? "; //trim(:ls_itemcode); sqlStr = "select tran_date from invoice where INVOICE_ID = ? "; //trim(:ls_itemcode);
pstmt = conn.prepareStatement( sqlStr ); pstmt = conn.prepareStatement( sqlStr );
......
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