Changed by Manish on 26/04/16

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

webitm-wms/ibase/webitm/ejb/wms/UploadOrderEJB.java

@@ -36,8 +36,9 @@ import org.w3c.dom.NodeList;
 import ibase.system.config.AppConnectParm;
 import ibase.system.config.ConnDriver;
 import ibase.utility.CommonConstants;
-import ibase.utility.EMail;
 import ibase.utility.E12GenericUtility;
+import ibase.utility.EMail;
+
 import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.MasterStatefulLocal;
@@ -893,14 +894,14 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 				+ "fin_link,black_listed,contact_code,trans_mode,rcp_mode,ignore_credit,pending_order,ignore_days,round,round_to,"
 				+ "located_at,stop_business,sales_option,dlv_term,hold_shipment,acct_code__adv,cctr_code__adv,site_code__pbus,part_qty,split_factor,"
 				+ "curr_code__frt,curr_code__ins,adhoc_repl_perc,full_name,rate_round,rate_round_to,master_pack,cancel_bo,single_lot,asn_reqd,"
-				+ "return_allowed,edi_reqd,chg_date,chg_term,chg_user,wave_type,email_addr) "//6
+				+ "return_allowed,edi_reqd,chg_date,chg_term,chg_user,wave_type,email_addr,registr_1) "//68
 				+ "values (?,?,?,?,?,?,?,?,?,?,"
 				+ "?,?,?,?,?,?,?,?,?,?,"
 				+ "?,?,?,?,?,?,?,?,?,?,"
 				+ "?,?,?,?,?,?,?,?,?,?,"
 				+ "?,?,?,?,?,?,?,?,?,?,"
 				+ "?,?,?,?,?,?,?,?,?,?,"
-				+ "?,?,?,?,?,?,?)"; //67
+				+ "?,?,?,?,?,?,?,?)"; //68
 			pstmt=conn.prepareStatement(sql);
 
 			pstmt.setString(1, headerValesMap.get("cust_code")); //cust_code
@@ -1037,7 +1038,11 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 			pstmt.setString(65, loginCode);//chg_user
 			pstmt.setString(66, "W0001");//wave_type
 			pstmt.setString(67, headerValesMap.get("notify_to"));//email_addr
-
+			
+			//changed by Manish on 25/04/16 to set the value of vender_no in registr_1[start]
+			pstmt.setString(68, headerValesMap.get("vender_no"));//registr_1
+			//changed by Manish on 25/04/16 to set the value of vender_no in registr_1[end]
+			
 			int rows=pstmt.executeUpdate();
 			System.out.println("Customer rows inserted------->>"+rows);    	
 			if(rows > 0)
@@ -1156,7 +1161,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		String currentSelectdLotNo = "";
 		InvAllocTraceBean invAllocTrace = new InvAllocTraceBean();
 		DistCommon discommon = new DistCommon();
-		E12GenericUtility genericUtility=new E12GenericUtility();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		try
 		{			
 			String dbDateFormat = genericUtility.getDBDateFormat();
@@ -1317,8 +1322,8 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 					strAllocate.put("lot_no",lotNo);
 					strAllocate.put("lot_sl",lotSl);
 					strAllocate.put("alloc_qty",new Double(lotQtyToBeAllocated));
-					strAllocate.put("chg_user",genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
-					strAllocate.put("chg_term",genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
+					strAllocate.put("chg_user",new E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
+					strAllocate.put("chg_term",new E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId"));
 					strAllocate.put("chg_win","W_SORDER");
 
 					System.out.println("To allocate ::: " + strAllocate.toString()+"]lotQtyToBeAllocated["+lotQtyToBeAllocated+"]");
@@ -1811,7 +1816,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		DistCommon discommon = new DistCommon();
-		E12GenericUtility genericUtility=new E12GenericUtility();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 
 		try
 		{
@@ -2011,7 +2016,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		trnAmountStr = "",pordMode = "",siteCodeShip = "",remarks = "",totAmt = "",dlvTo = "",
 		vendorTxCode = "",exchRateStr = "",ordAmtStr = "",dueDateStr = "",taxDateStr = "",acctCodeSal = "",
 		securityKey = "",frtAmtStr = "",empCodeOrd = "",orderDateStr = "",taxAmtStr = "",dlvTerm = "",
-		vpsTxId = "",saleOrder = "",priceList = "";
+		vpsTxId = "",saleOrder = "",priceList = "",venderNo = "";
 
 		NodeList parentNodeList = null;
 		NodeList childNodeList = null;
@@ -2100,7 +2105,10 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 					trnAmountStr =  checkNull(eElement.getElementsByTagName("trn_amount").item(0).getTextContent());
 					System.out.println("vendorTxCode----->"+vendorTxCode+"] vpsTxId--->>["+vpsTxId+"]");
 					System.out.println("securityKey----->"+securityKey+"] trnAmountStr--->>["+trnAmountStr+"]");				
-
+					//changed by Manish on 25/04/16 to get the value of vender_no [start]
+					venderNo =  checkNull(eElement.getElementsByTagName("vender_no").item(0).getTextContent());	
+					System.out.println("venderNo----->"+venderNo);	
+					//changed by Manish on 25/04/16 to get the value of vender_no [end]
 
 				}
 			}	    	 
@@ -2188,6 +2196,9 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 			headerValesMap.put("vps_tx_id",vpsTxId);
 			headerValesMap.put("security_key",securityKey);
 			headerValesMap.put("trn_amount",trnAmountStr);
+			//changed by Manish on 25/04/16 to put the value of vender_no in map [start]
+			headerValesMap.put("vender_no",venderNo);
+			//changed by Manish on 25/04/16 to put the value of vender_no in map [end]
 		}
 		else
 		{