Added tran_code and tran_code_o in Sales Return Amendment.Values get updated in sreturn

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

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

@@ -62,8 +62,8 @@ public class SReturnAmd extends ValidatorEJB implements SReturnAmdLocal,SReturnA
 		
 		String siteCode = ""; 
 		String custCode = "";
-		
-		String childNodeName = null;
+		String tranCode="";
+	String childNodeName = null;
 		String errString = "";
 		String errCode = "";
 		String userId = "";
@@ -271,6 +271,38 @@ public class SReturnAmd extends ValidatorEJB implements SReturnAmdLocal,SReturnA
 								}
 							}
 							
+							//added by priyanka on 04/03/15 as per manoj sharma instruction
+							else if(childNodeName.equalsIgnoreCase("tran_code"))
+							{
+								tranCode = checkNull(genericUtility.getColumnValue("tran_code", dom));
+								System.out.println("tranCode="+tranCode);
+								if(tranCode != null && tranCode.trim().length() > 0)
+								{
+									sql = "SELECT count(*) FROM transporter where tran_code = ?";
+									pstmt =  conn.prepareStatement(sql);
+									pstmt.setString(1,tranCode);
+									rs = pstmt.executeQuery();
+									if(rs.next())
+									{
+										cnt =  rs.getInt(1);
+										System.out.println("COUNT = "+cnt);
+									    
+									}
+									rs.close();
+									rs = null;
+									pstmt.close();
+									pstmt = null;
+									
+								    if(cnt == 0) 
+								    {
+								    	errCode = "INVTRANCOD";
+								    	errList.add(errCode);
+								    	errFields.add(childNodeName.toLowerCase());
+								    }
+									
+								}
+							}
+							
 						}
 				break;
 			}
@@ -385,6 +417,7 @@ public class SReturnAmd extends ValidatorEJB implements SReturnAmdLocal,SReturnA
 		String lorryNo = "";
 		String frtType = "";
 		String frtAmt = "";
+		String tranCode="";
 		String childNodeName = null;
 		String sql = "";
 		StringBuffer valueXmlString = new StringBuffer();
@@ -444,7 +477,9 @@ public class SReturnAmd extends ValidatorEJB implements SReturnAmdLocal,SReturnA
 								  "(case when trans_mode is null then ' ' else trans_mode end) as trans_mode,"+
 								  "(case when lorry_no is null then ' ' else lorry_no end) as lorry_no,"+
 								  "(case when frt_type is null then ' ' else frt_type end) as frt_type,"+
-								  "(case when frt_amt is null then 0 else frt_amt end) as frt_amt from sreturn where tran_id = ?";
+								  "(case when frt_amt is null then 0 else frt_amt end) as frt_amt," +
+								  "(case when tran_code is null then ' ' else tran_code end) as tran_code" +
+								  " from sreturn where tran_id = ?";
 							
 							System.out.println("sql for tran date["+sql+"]");
 							pstmt =conn.prepareStatement(sql);
@@ -461,6 +496,7 @@ public class SReturnAmd extends ValidatorEJB implements SReturnAmdLocal,SReturnA
 								lorryNo = rs.getString("lorry_no");
 								frtType = rs.getString("frt_type");
 								frtAmt = rs.getString("frt_amt");
+								tranCode = rs.getString("tran_code");//added by priyanka on 03/03/15 as per manoj sharma instruction
 								System.out.println("Value come ffrom item ch:");
 								System.out.println("ref id ="+refId);
 								System.out.println("ref date ="+refDate);
@@ -472,6 +508,8 @@ public class SReturnAmd extends ValidatorEJB implements SReturnAmdLocal,SReturnA
 								System.out.println("lorry no ="+lorryNo);
 								System.out.println("frt type ="+frtType);
 								System.out.println("frt amd ="+frtAmt);
+								System.out.println("tranCode ="+tranCode);//added by priyanka on 03/03/15 as per manoj sharma instruction
+								
 								valueXmlString.append("<ref_date>").append("<![CDATA[" + sdf2.format(refDate) +"]]>").append("</ref_date>");
 								valueXmlString.append("<site_code>").append("<![CDATA[" + siteCode +"]]>").append("</site_code>");
 								valueXmlString.append("<cust_code>").append("<![CDATA[" + custCode +"]]>").append("</cust_code>");
@@ -497,6 +535,12 @@ public class SReturnAmd extends ValidatorEJB implements SReturnAmdLocal,SReturnA
 								valueXmlString.append("<frt_amt>").append("<![CDATA[" + frtAmt +"]]>").append("</frt_amt>");
 								valueXmlString.append("<frt_type__o>").append("<![CDATA[" + frtType +"]]>").append("</frt_type__o>");
 								valueXmlString.append("<frt_amt__o>").append("<![CDATA[" + frtAmt +"]]>").append("</frt_amt__o>");
+								
+								
+								//added by priyanka on 03/03/15 as per manoj sharma instruction
+								
+								valueXmlString.append("<tran_code__o>").append("<![CDATA[" + tranCode +"]]>").append("</tran_code__o>");
+								valueXmlString.append("<tran_code>").append("<![CDATA[" + tranCode +"]]>").append("</tran_code>");
 							}
 							rs.close();
 							rs = null;

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

@@ -51,6 +51,7 @@ public class SReturnAmdConf  extends ActionHandlerEJB implements SReturnAmdConfL
 		String sql1 = "";
 		int status = 0;
 		double frtAmt = 0.0;
+		String tranCode="";
 		Date lrDate = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
@@ -88,7 +89,7 @@ public class SReturnAmdConf  extends ActionHandlerEJB implements SReturnAmdConfL
 					else
 					{
 						System.out.println("Update");
-						sql = "select (case when lr_no is null then ' ' else lr_no end)AS lr_no,lr_date,(case when trans_mode is null then ' ' else trans_mode end)AS trans_mode,(case when lorry_no is null then ' ' else lorry_no end)as lorry_no,(case when frt_type is null then ' 'else frt_type end)as frt_type,(case when frt_amt is null then 0 else frt_amt end)as frt_amt,ref_id from sreturn_amd where tran_id = ?";
+						sql = "select (case when lr_no is null then ' ' else lr_no end)AS lr_no,lr_date,(case when trans_mode is null then ' ' else trans_mode end)AS trans_mode,(case when lorry_no is null then ' ' else lorry_no end)as lorry_no,(case when frt_type is null then ' 'else frt_type end)as frt_type,(case when frt_amt is null then 0 else frt_amt end)as frt_amt,(case when tran_code is null then ' ' else tran_code end) as tran_code,ref_id from sreturn_amd where tran_id = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,tranId);
 						rs = pstmt.executeQuery();
@@ -101,6 +102,7 @@ public class SReturnAmdConf  extends ActionHandlerEJB implements SReturnAmdConfL
 							lorryNo = rs.getString("lorry_no");
 							frtType = rs.getString("frt_type");
 							frtAmt = rs.getDouble("frt_amt");
+							tranCode = rs.getString("tran_code");//added by priyanka on 03/03/15 as per manoj sharma instructiona
 							refId = rs.getString("ref_id");
 							System.out.println("LrNO="+lrNo);
 							System.out.println("LrDate="+lrDate);
@@ -109,13 +111,14 @@ public class SReturnAmdConf  extends ActionHandlerEJB implements SReturnAmdConfL
 							System.out.println("Frt Type="+frtType);
 							System.out.println("Frt Amt="+frtAmt);
 							System.out.println("Ref Id ="+refId);
+							System.out.println("tranCode ="+tranCode);//added by priyanka on 03/03/15 as per manoj sharma instruction
 						}
 						pstmt.close();
 						pstmt = null;
 						rs.close();
 						rs = null;
 						//
-						sql = "update SRETURN set LR_NO = ? ,LR_DATE = ? ,LORRY_NO= ? ,TRANS_MODE= ?,FRT_TYPE =?,FRT_AMT = ? WHERE TRAN_ID = ?";
+						sql = "update SRETURN set LR_NO = ? ,LR_DATE = ? ,LORRY_NO= ? ,TRANS_MODE= ?,FRT_TYPE =?,FRT_AMT = ?,TRAN_CODE= ? WHERE TRAN_ID = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,lrNo);
 						if(lrDate == null) 
@@ -130,7 +133,8 @@ public class SReturnAmdConf  extends ActionHandlerEJB implements SReturnAmdConfL
 						pstmt.setString(4, transMode);
 						pstmt.setString(5, frtType);
 						pstmt.setDouble(6, frtAmt);
-						pstmt.setString(7, refId);
+						pstmt.setString(7, tranCode);//added by priyanka on 03/03/15 as per manoj sharma instruction
+						pstmt.setString(8, refId);
 						status =  pstmt.executeUpdate();
 						System.out.println("nO OF ROWS UPADTE="+status);
 						conn.commit();