modify

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

webitm-fin/module-resource/js/BankRecoWiz.js

@@ -167,6 +167,8 @@ function getCheckedValues(frm) {
 	// For each checkbox see if it has been checked, record the value.
    	//alert("length :"+frm.checkbox1.length);
 	//alert("frm.checkbox1.length :"+frm.checkbox1.length);
+	var BTFinalTranType="";
+	var BSFinalTranType="";
 	
 	for (i = 0; i < frm.checkbox1.length; i++)
 	{
@@ -267,9 +269,9 @@ function getCheckedValues(frm) {
 				var amtAdjBT = document.getElementById("amt_adj" + cnt).innerHTML;
 				//alert("amtAdjBT :"+amtAdjBT);
 			
-				alert("@@@@@@@@@@@@@@@@@@@@@@");
+				//alert("@@@@@@@@@@@@@@@@@@@@@@");
 				var currCodeBT = document.getElementById("curr_code" + cnt).innerHTML;
-				alert("currCodeBT :"+currCodeBT);
+				//alert("currCodeBT :"+currCodeBT);
 			}
 			
 			
@@ -381,7 +383,7 @@ function getXMLDataValues(frm)
 	var bankCode = document.getElementById("bank_code").value;
 	//var siteR = document.getElementById("site_code_to").value;
 	var lamount = 0.0,ramount = 0.0;
-	alert("frm.checkbox1.length "+frm.checkbox1.length);
+	//alert("frm.checkbox1.length "+frm.checkbox1.length);
 	for (i = 0; i < frm.checkbox1.length; i++) {
 		//if (frm.checkbox1[i].checked) {
 
@@ -544,7 +546,7 @@ function getXMLDataValues(frm)
 		returnValueStr = false;
 	}*/
 	xmlData += "</Detail2>";
-	alert("xmlData !!!!: " + xmlData);
+	//alert("xmlData !!!!: " + xmlData);
 	return xmlData;
 }
 

webitm-fin/module-resource/jsp/BankRecoWiz.jsp

@@ -5,7 +5,7 @@
 
 <%
     
-	System.out.println("@@@@@@@@@ In ICRWizardSaveSample.jsp @@@@@@@@@@@@@@@@");
+	System.out.println("@@@@@@@@@ In BankRecoWiz.jsp @@@@@@@@@@@@@@@@");
 	// StrgMeetWizardBean itmWizardBean = new StrgMeetWizardBean();
 	
 	//System.out.println("request.getParameter(\"SELECTED_ITEM\") "+request.getParameter("SELECTED_ITEM"));
@@ -27,7 +27,7 @@
 	// String htmlData = MRPWizardBean.getSalesPersSampleItemList( salesPers, strgCode, selectedItems, selectedSampleItems );
 	String result = icrWizPrsSave.preSaveForm(saveSampleData,reconcileType,autoReconFilter);
 	
-	System.out.println("result:"+result);
+	System.out.println("@@@@@@@result:[["+result+"]]");
 
 	if(result.indexOf("Success") > -1)
 	{
@@ -94,6 +94,38 @@
 
 	<%
 		
+	}
+	else if(result.indexOf("KEYNTMATCH") > -1)
+	{
+		%>	
+		<script type="text/javascript">
+		//parent.window.close();
+		//this.window.close();
+		
+		alert("Key and Selected Data doesn't match..!!");
+		window.history.back();
+		//window.location = 'E12WizardPage.jsp?OBJ_NAME=bank_reconciliation_wiz&amp;FORM_NO=1';
+		
+		//window.close();
+		</script>
+
+	<%
+	}
+	else if(result.indexOf("AMTNTMATCH") > -1)
+	{
+		%>	
+		<script type="text/javascript">
+		//parent.window.close();
+		//this.window.close();
+		
+		alert("amount of both side doesn't match..!!");
+		window.history.back();
+		//window.location = 'E12WizardPage.jsp?OBJ_NAME=bank_reconciliation_wiz&amp;FORM_NO=1';
+		
+		//window.close();
+		</script>
+
+	<%
 	}
 	else
 	{%>