Changes for reason code

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

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

@@ -4981,6 +4981,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						if( mcount1 > 0 )
 						{
 							valueXmlString.append("<status>").append("<![CDATA[" + "E" + "]]>").append("</status>");
+							setNodeValue( dom, "status", "E" );
 							valueXmlString.append("<stk_opt>").append("<![CDATA[" + "N" + "]]>").append("</stk_opt>");
 
 							mvarValue = distCommon.getDisparams( "999999", "EXPIRED_LOC", conn );
@@ -5005,7 +5006,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							pstmt = null;
 							
 							valueXmlString.append("<location_descr>").append("<![CDATA[" + locDescr + "]]>").append("</location_descr>");
-
+						// added by nandkumar gadkari on21/09/19
+							reStr = itemChanged(dom, dom1, dom2, objContext, "status", editFlag, xtraParams);
+							pos = reStr.indexOf("<Detail2>");
+							reStr = reStr.substring(pos + 9);
+							pos = reStr.indexOf("</Detail2>");
+							reStr = reStr.substring(0,pos);
+							valueXmlString.append(reStr);
 						}
 						else
 						{
@@ -5185,7 +5192,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						//valueXmlString = minRateBuff;
 						//gbf_scheme_history( mrate, currentColumn.trim() );
 						//gbf_get_set_costrate();
-
+						// ADDED BY NANDKUMAR GADKARI ON 21/09/19
+					
+						reStr = itemChanged(dom, dom1, dom2, objContext, "status", editFlag, xtraParams);
+						pos = reStr.indexOf("<Detail2>");
+						reStr = reStr.substring(pos + 9);
+						pos = reStr.indexOf("</Detail2>");
+						reStr = reStr.substring(0,pos);
+						valueXmlString.append(reStr);
 					} //  end of lot_sl
 					
 					//start of new
@@ -5641,32 +5655,6 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						}
 						System.out.println( " mvarName :1: " + mvarName );
 						//mvarValue = " ";
-						// ADDED BY NANDKUMAR GADKARI ON 13/09/19-------------------start
-						mreasCode =	genericUtility.getColumnValue( "reas_code", dom1 ); //dw_detedit[ii_currformno].getitemstring(1,"reas_code")
-						
-						sqlStr = " Select loc_code  "
-								+"	from sreturn_reason "
-								+"	where reason_code = ? "; 
-						
-						pstmt = conn.prepareStatement( sqlStr );
-						
-						pstmt.setString( 1, mreasCode );
-						
-						rs = pstmt.executeQuery();
-						mreasonDescr = "";
-						if( rs.next() )
-						{
-							
-							mvarValue = rs.getString( "loc_code" );
-						}
-						rs.close();
-						rs = null;
-						pstmt.close();
-						pstmt = null;
-						valueXmlString.append("<loc_code>").append("<![CDATA[" + mvarValue + "]]>").append("</loc_code>");
-						if(mvarValue == null || mvarValue.trim().length()==0   )
-						{
-						// ADDED BY NANDKUMAR GADKARI ON 13/09/19-------------------end
 						
 						if( mvarName != null && mvarName.trim().length() > 0 &&  !"NULLFOUND".equalsIgnoreCase( mvarName ) )
 						{
@@ -5682,7 +5670,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							mvarValue = genericUtility.getColumnValue( "loc_code", dom ); //dw_detedit[ii_currformno].getitemstring(1,"loc_code")
 							System.out.println( "mvarValue :6: " + mvarValue ); 
 						}
-						}
+						
 						mloc = " ";
 						sqlStr = "select descr mloc, inv_stat ls_inv_stat " //into :mloc, :ls_inv_stat 
 								+"	from location " 
@@ -5843,6 +5831,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 					        	  mvarValue1="";
 					           }
 							valueXmlString.append("<reas_code>").append("<![CDATA[" + mvarValue1 + "]]>").append("</reas_code>");
+							setNodeValue( dom, "reas_code", mvarValue1);//added by nandkumar gadkari on 11/09/19--------
 							sqlStr = " Select reason_descr mreason_descr from sreturn_reason where reason_code = ? "; 
 						
 						    pstmt = conn.prepareStatement( sqlStr );
@@ -5860,6 +5849,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						    System.out.println("Reson description is");
 						valueXmlString.append("<reason_descr>").append("<![CDATA["+ mreasonDescr +"]]>").append("</reason_descr>");
 						}
+					
+						////added by nandkumar gadkari on 11/09/19--------
+						
+						reStr = itemChanged(dom, dom1, dom2, objContext, "reas_code", editFlag, xtraParams);
+						pos = reStr.indexOf("<Detail2>");
+						reStr = reStr.substring(pos + 9);
+						pos = reStr.indexOf("</Detail2>");
+						reStr = reStr.substring(0,pos);
+						valueXmlString.append(reStr);
 					}//end of status
 					
 				else if (currentColumn.trim().equals( "stk_opt" ) )
@@ -5938,15 +5936,27 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 					if(status !=null && status.trim().length() > 0 && locCode!=null && locCode.trim().length() > 0)
 					{
 						valueXmlString.append("<status>").append("<![CDATA["+ status +"]]>").append("</status>");
-						//valueXmlString.append("<loc_code>").append("<![CDATA["+ locCode +"]]>").append("</loc_code>");
+						valueXmlString.append("<loc_code>").append("<![CDATA["+ locCode +"]]>").append("</loc_code>");
+						sqlStr = "select descr mloc " 
+								+"	from location " 
+								+"	where loc_code = ? ";
+						
+						pstmt = conn.prepareStatement( sqlStr );
+						
+						pstmt.setString( 1, locCode );
+
+						rs = pstmt.executeQuery();
+						if( rs.next() )
+						{
+							mloc = rs.getString( "mloc" );
+							valueXmlString.append("<location_descr>").append("<![CDATA[" + mloc + "]]>").append("</location_descr>");							
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
 					}
-					setNodeValue( dom, "status", status );
-					reStr = itemChanged(dom, dom1, dom2, objContext, "status", editFlag, xtraParams);
-					pos = reStr.indexOf("<Detail2>");
-					reStr = reStr.substring(pos + 9);
-					pos = reStr.indexOf("</Detail2>");
-					reStr = reStr.substring(0,pos);
-					valueXmlString.append(reStr);
+				
 					
 				}
 				else if (currentColumn.trim().equals( "exp_date" ) )