if stock not in table expiry date calculation done as per shelf_life

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

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

@@ -2134,6 +2134,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						locCode = genericUtility.getColumnValue("loc_code", dom);
 						lotNo = genericUtility.getColumnValue("lot_no", dom);
 						lotSl = genericUtility.getColumnValue("lot_sl", dom);
+						custCode = genericUtility.getColumnValue("cust_code", dom1);
 												
 						if (locCode == null || locCode.equals("null") || locCode.trim().length() == 0 )
 						{
@@ -2269,6 +2270,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							rs =  null;
 							pstmt.close();
 							pstmt = null;
+							System.out.println("site_customer channelPartner [" + channelPartner + "]"); 
 
 							if( channelPartner == null || channelPartner.trim().length() == 0 )
 							{
@@ -2291,9 +2293,10 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 								rs =  null;
 								pstmt.close();
 								pstmt = null;
+								System.out.println("customer channelPartner [" + channelPartner + "]"); 
 
 							}
-							if ( channelPartner != null && !"Y".equals( channelPartner ) )
+							if ( (channelPartner != null && !"Y".equals( channelPartner )) || (channelPartner == null || "N".equals( channelPartner )) )
 							{
 								
 								sqlStr =" select deduct_perc " //into :mdisc 
@@ -2629,10 +2632,12 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						
 						if((mexpDate != null ) || (!(mexpDate.equals(""))))
 						{
-							
+							mtranDateStr = genericUtility.getColumnValue( "tran_date", dom1 ); // dw_header.getitemdatetime(1,"tran_date")
 							mexpDate  = Timestamp.valueOf(genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
 							
+							
 							mtranDateStr = genericUtility.getColumnValue( "lr_date", dom1 ); // dw_header.getitemdatetime(1,"lr_date")
+							mtranDate = Timestamp.valueOf(genericUtility.getValidDateString( mtranDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
 							// 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