change done in item changed on mfg_date

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@29936 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java

@@ -3321,6 +3321,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						
 						valueXmlString.append("<mrp_value>").append("<![CDATA[" + quantity * rateClg + "]]>").append("</mrp_value>");
 						setNodeValue( dom, "mrp_value", quantity * rateClg );
+						System.out.println("<<<<<<<<<<DISCOUNT>>>>>>>>>>= "+ discount);
 						valueXmlString.append("<discount>").append("<![CDATA[" + discount + "]]>").append("</discount>");
 						setNodeValue( dom, "discount", discount );
 						
@@ -3988,9 +3989,11 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							else
 							{	
 								mexpDate  = distCommon.CalcExpiry( mmfgDate, mshlife );
+								System.out.println("AAAA MEXPdATE [ "+mexpDate+" ] ");
 								valueXmlString.append("<exp_date>").append("<![CDATA[" + genericUtility.getValidDateString( mexpDate.toString(),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat() ) + "]]>").append("</exp_date>");
 								setNodeValue( dom, "exp_date",  genericUtility.getValidDateString( mexpDate.toString(),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat() ));//Added By Mahesh Patidar on 16/04/2012 for set expiry date in node
 							}
+							System.out.println("AAAA MEXPdATE [ "+mexpDate+" ] ");
 						}
 						else
 						{
@@ -4010,19 +4013,29 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							if (mtranDateStr != null)
 							{
 								mexpDate  = Timestamp.valueOf(genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-								
+								System.out.println("mexpDate [ "+mexpDate+" ]");
 								mtranDateStr = genericUtility.getColumnValue( "lr_date", dom1 ); // dw_header.getitemdatetime(1,"lr_date")
 								// 17/06/10 manoharan commented and put in else condition as null is to be taken care off
 								//ldtLrdate = Timestamp.valueOf(genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-								if( ldtLrdate == null || "19000101".equals( genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), "yyyymmdd" ) ) ) //Isnull(ldt_lrdate) or string(ldt_lrdate,"yyyymmdd") = "19000101" then
+								
+								//Commented By Mahesh Patidar on 02/05/2012 for checking the dom string is null or not
+								//if( mtranDateStr == null || "19000101".equals( genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), "yyyymmdd" ) ) ) //Isnull(ldt_lrdate) or string(ldt_lrdate,"yyyymmdd") = "19000101" then
+								//{	
+								//	ldtLrdate = mtranDate;
+								//}
+								//Ended By Mahesh Patidar
+								
+								//Change Condition By Mahesh Patidar on 02/05/2012 for Checking DOM tran Date String is null or not
+								if( mtranDateStr == null || "19000101".equals( genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), "yyyymmdd" ) ) ) //Isnull(ldt_lrdate) or string(ldt_lrdate,"yyyymmdd") = "19000101" then
 								{	
 									ldtLrdate = mtranDate;
-								}
+								}//ended By Mahesh Patidar
 								else
 								{
 									ldtLrdate = Timestamp.valueOf(genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
 
 								}
+								System.out.println("lrDate = [ "+ldtLrdate+" ]");
 								// end 17/06/10 manoharan
 								mdiffDays = (int)utilMethods.DaysAfter( ldtLrdate, mexpDate );
 								mdays = mdiffDays;