insert sundry_type_pay and sundry_code_pay into ibcapaydet.

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

webitm-fin/ibase/webitm/ejb/fin/adv/MiscValConf.java

@@ -192,7 +192,7 @@ conn = getConnection();
 		String payMode="",bankCode="",entryBatchNo="",analCode="",empCode="",acctCodeCf="",cctrCodeCf="",confirmed="";
 		String remarks="",rndOff="",sundryTypePay="",sundryCodePay="",acctCodePay="",cctrCodePay="",chqName="";
 		String mvouchGenTranId="",tourId="",tranIdGen="",acctRnd="",cctrRnd="",taxAcct="",taxCctr="";
-		
+		String sitePayment = ""; // Added By PriyankaC on 22-MAY-2019.
 		java.sql.Timestamp tranDate = null;
 		java.sql.Timestamp effDate = null;
 		java.sql.Timestamp billDate = null;
@@ -268,7 +268,8 @@ conn = getConnection();
 				+" tax_amt,tot_amt,adv_amt,acct_code__adv,cctr_code__adv,net_amt,net_amt__bc,auto_pay, "
 				+" pay_mode,bank_code,entry_batch_no,anal_code,emp_code,diff_amt__exch,acct_code__cf,cctr_code__cf,confirmed, "
 				+" remarks,supp_bill_amt,exch_rate,rnd_off,rnd_to,rnd_amt,sundry_type__pay,sundry_code__pay, "
-				+" acct_code__pay,cctr_code__pay,chq_name,mvouch_gen_tran_id,tour_id,tran_id__gen "
+				//+" acct_code__pay,cctr_code__pay,chq_name,mvouch_gen_tran_id,tour_id,tran_id__gen, "
+				+" acct_code__pay,cctr_code__pay,chq_name,mvouch_gen_tran_id,tour_id,tran_id__gen,site_code__pay "
 				+"	FROM misc_voucher "
 				+" WHERE  TRAN_ID = ? " ;
 			pstmt = conn.prepareStatement(sql);
@@ -325,6 +326,7 @@ conn = getConnection();
 				mvouchGenTranId = rs.getString("mvouch_gen_tran_id");
 				tourId = rs.getString("tour_id");
 				tranIdGen = rs.getString("tran_id__gen");
+				sitePayment = rs.getString("site_code__pay");
 			}
 			rs.close();
 			rs = null;
@@ -383,7 +385,9 @@ conn = getConnection();
 			//changes by Dadaso on 22-AUG-2014 [START]
 			mischdrMap.put("hold_amt","0");
 			//changes by Dadaso on 22-AUG-2014 [END]		
-										
+		   //Added By PriyankaC on 22-MAY-2019[Start].
+			mischdrMap.put("site_code__pay",sitePayment);
+			//Added By PriyankaC on 22-MAY-2019. [END]
 			//lds_det ---> d_misc_vouchdet_brow	
 			System.out.println("added data map miscdetList.........111");
 			sql = " SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
@@ -1262,7 +1266,7 @@ conn = getConnection();
 		String finEntTo="",ibcaId="",link="",acctFr="",cctrFr="",acctTo="",cctrTo="",remarks="";
 		String curr="",bank="",acct="",cctr="",bill="",purcOrder="",autoPay="",payMode="",batch="",crTerm="";
 		double amount=0,exch=0,suppAmt=0,adv=0,amountBc=0;
-		
+		String sundryTypePay = "",suppPay = "" ; // Added By PriyankaC on 21MAY2019.
 		java.sql.Timestamp billDt = null;
 		java.sql.Timestamp dueDate = null;
 		java.sql.Timestamp tranDate = null;
@@ -1303,10 +1307,20 @@ conn = getConnection();
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
 			
+			//Added By PriyankaC on 22MAY2019 [Start].
 			sundryType = (String)mischdrMap.get("sundry_type");
-			if("S".equalsIgnoreCase(sundryType))
+			suppPay  =(String)mischdrMap.get("sundry_code__pay");
+			sitePayment = (String)mischdrMap.get("site_code__pay");
+			siteCode =(String)mischdrMap.get("site_code");
+			sundryTypePay = (String)mischdrMap.get("sundry_type__pay");
+			supp  =(String)mischdrMap.get("sundry_code");
+			System.out.println("sitePayment " +sitePayment);
+			//Added By PriyankaC on 22MAY2019 [END].
+		/*	if("S".equalsIgnoreCase(sundryType))
 			{
 				supp  =(String)mischdrMap.get("sundry_code");
+				//Added By PriyankaC on 21MAY2019.
+				suppPay  =(String)mischdrMap.get("sundry_code__pay");
 				siteCode =(String)mischdrMap.get("site_code");
 				// 13/10/16 manoharan site_code__pay to be taken from misc_voucher
 				//sql =" select site_code__pay from site_supplier where supp_code = ? and site_code = ? ";
@@ -1337,7 +1351,7 @@ conn = getConnection();
 					pstmtInner = null;
 					System.out.println("Else sitePayment"+sitePayment);
 				}
-				*/
+				
 				rs.close();
 				rs = null;
 				pstmt.close();
@@ -1732,7 +1746,9 @@ conn = getConnection();
 				pstmt =null;
 			}
 			}//End by Abhijit Gaikwad
+*/			
 			System.out.println("sitePayment"+sitePayment+" !=siteCode"+siteCode);
+			System.out.println("sundryTypePay"+sundryTypePay+" !=suppPay"+suppPay);
 			if(sitePayment== null || sitePayment.trim().length() == 0 ) // Condition added by Nandkumar Gadkari on 26/07/18
 			{
 				sitePayment=siteCode;
@@ -1740,6 +1756,7 @@ conn = getConnection();
 			
 			if((!sitePayment.trim().equals(siteCode.trim())) && (("I").equalsIgnoreCase(runMode)))
 			{
+				System.out.println("sitePayment"+sitePayment+" !=siteCode"+siteCode);
 				winName = "W_PAY_IBCA";
 				sql ="select key_string from transetup where upper(tran_window) = ? ";
 				pstmt = conn.prepareStatement(sql);
@@ -1953,8 +1970,12 @@ conn = getConnection();
 				pstmt.setTimestamp(4,refDate);
 				pstmt.setString(5,curr);
 				pstmt.setDouble(6,exch);
-				pstmt.setString(7,sundryType);
-				pstmt.setString(8,supp);
+				//Changed By PriyankaC on 21MAy2019 [Start]
+				//pstmt.setString(7,sundryType);
+				//pstmt.setString(8,supp);
+				pstmt.setString(7,sundryTypePay);
+				pstmt.setString(8,suppPay);
+				//Changed By PriyankaC on 21MAy2019 [END]
 				pstmt.setString(9,acct);
 				pstmt.setString(10,cctr);
 				pstmt.setTimestamp(11,dueDate);