Updated EJB Component for Bank Guarantee.[F15DSUN018]

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

webitm-fin/ibase/webitm/ejb/fin/BankGuaranteeIC.java

@@ -73,7 +73,7 @@ public class BankGuaranteeIC extends ValidatorEJB implements BankGuaranteeICLoca
 		String siteCode = "",siteCodeFor="",confirmed="",effDateStr="";
 		String purcOrder="",prdCode="";
 		String keyFlag="",tranId="",noOfDays="",currCode="",tranDateStr="",dueDateStr="";
-		String currDate="",statSal="";
+		String currDate="",statFin="";
 		Date dueDate=null,tranDate=null,trDate=null;
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		
@@ -148,63 +148,51 @@ public class BankGuaranteeIC extends ValidatorEJB implements BankGuaranteeICLoca
 								errList.add("VMTRANID");
 								errFields.add(childNodeName.toLowerCase());
 							}
-							else
+							System.out.println("Edit Flag>>>>"+editFlag);
+							if(editFlag.equalsIgnoreCase("A"))
 							{
-								sql1="select count(1) from lc_voucher where tran_id= ? ";
-								pstmt1=conn.prepareStatement(sql1);
-								pstmt1.setString(1,tranId);
-								rs1=pstmt1.executeQuery();
-								if(rs1.next())
+								System.out.println("Edit Flag"+editFlag);
+								sql = " select count(1) from lc_voucher where tran_id = ?";
+								pstmt =  conn.prepareStatement(sql);
+								pstmt.setString(1,tranId);
+								rs = pstmt.executeQuery();
+								if(rs.next())
 									{
-									cnt =  rs1.getInt(1);
-									System.out.println("Count>>>>>>>>>"+cnt);
-								}
-								rs1.close();
-								rs1 = null;
-								pstmt1.close();
-								pstmt1 = null;
-								
+									cnt =  rs.getInt(1);
 									if(cnt > 0) 
 									{
-									System.out.println("Tran Id already exist, please enter another tran id.");
 										errCode = "VMTRANIDEX";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());	
 									}									
 								}
+								rs.close();
+								rs = null;
+								pstmt.close();
+								pstmt = null;
+							}
 						}
 					}
 					
 					else if(childNodeName.equalsIgnoreCase("tran_date"))
 					{
-						t1Str = genericUtility.getColumnValue("tran_date",dom);
-						t1Ts = Timestamp.valueOf(genericUtility.getValidDateString(t1Str,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())+ " 00:00:00.0");
-						System.out.println("Tran date>>>>>>>>"+t1Date);
+						tranDateStr = genericUtility.getColumnValue("tran_date",dom, "1");
+						tranDateTs = Timestamp.valueOf(genericUtility.getValidDateString(tranDateStr,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())+ " 00:00:00.0");
 
-						if(t1Str != null && (t1Str.trim().length() > 0))
-						{
-							sql = "select code from period where ? between fr_date and to_date ";
+						sql = "Select code from period where ? between fr_date and to_date ";
 						pstmt = conn.prepareStatement(sql);
-							pstmt.setTimestamp(1,t1Ts);
+						pstmt.setTimestamp(1, tranDateTs);
 						rs = pstmt.executeQuery();
 						if (rs.next()) 
 						{
 							prdCode = rs.getString(1);
-								System.out.println("prcode>>>>>"+prdCode);
+							System.out.println("Period Code>>>>>>"+prdCode);
 						}
 						rs.close();
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-							
-							if (prdCode == null || prdCode.trim().length() == 0) 
-							{
-								System.out.println("Project Code not Defined.");
-								errCode = "VMPRDNTDF";
-								errList.add(errCode);
-								errFields.add(childNodeName.toLowerCase());	
-							}
-							else  //(prdCode != null && prdCode.trim().length() > 0) 
+						if (prdCode != null && prdCode.trim().length() > 0) 
 						{
 							sql = "Select count(1) from period_stat where prd_code = ? "
 									+ " AND site_code = ? ";
@@ -212,9 +200,9 @@ public class BankGuaranteeIC extends ValidatorEJB implements BankGuaranteeICLoca
 							pstmt.setString(1, prdCode.trim());
 							pstmt.setString(2, siteCode.trim());
 							rs = pstmt.executeQuery();
-								if (rs.next()) 
-								{
+							if (rs.next()) {
 								cnt = rs.getInt(1);
+								System.out.println("Count for prdCode>>>>>>>>>>"+cnt);
 							}
 							rs.close();
 							rs = null;
@@ -222,44 +210,45 @@ public class BankGuaranteeIC extends ValidatorEJB implements BankGuaranteeICLoca
 							pstmt = null;
 							if (cnt > 0) 
 							{
-									sql = "Select stat_sal from period_stat where prd_code = ? and site_code = ? ";
+								sql = "Select stat_fin from period_stat where prd_code = ? and site_code = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, prdCode.trim());
 								pstmt.setString(2, siteCode.trim());
 								rs = pstmt.executeQuery();
 								if (rs.next())
 								{
-										statSal = rs.getString(1);
+									statFin = rs.getString(1);
+									System.out.println("Status Fin>>>>>>>"+statFin);
 								}
 								rs.close();
 								rs = null;
 								pstmt.close();
 								pstmt = null;
-	
-									if (statSal != null && statSal.trim().equalsIgnoreCase("N")) 
+								if(statFin != null && statFin.equalsIgnoreCase("N"))
 								{
-										errString = itmDBAccessEJB.getErrorString("", "VMSTATSNVL", userId);
-										break;
+									errString = itmDBAccessEJB.getErrorString("","VTPRDFIN","","",conn);
+									return errString;
 								}
 							} 
 							else 
 							{
-									errString = itmDBAccessEJB.getErrorString("","VMSTATSND", userId);
-									break;
+								errCode = "VMSTATSND";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
 							}
 						} 
-							/*else 
+						else 
 						{
-								errString = itmDBAccessEJB.getErrorString("","VMPRDNTDF", userId);
-								break;
-							}*/
+							errCode = "VMPRDNTDF";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
 						}
 					}
 					else if(childNodeName.equalsIgnoreCase("site_code__for"))
 					{ 
 						siteCodeFor = genericUtility.getColumnValue("site_code__for", dom);
 						System.out.println("Site Code For>>>>>>>>"+siteCodeFor);
-						if(siteCodeFor == null || (siteCodeFor.length() == 0))
+						if(siteCodeFor == null || (siteCodeFor.trim().length() == 0))
 						{
 							errList.add("NULLBGBENF");
 							errFields.add(childNodeName.toLowerCase());

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

@@ -101,7 +101,7 @@ public class BankGuaranteeConf extends ActionHandlerEJB implements BankGuarantee
 				if(updateCount > 0) 
 				{
 					System.out.println(">>The selected transaction is confirmed");
-					errString = itmDBAccessEJB.getErrorString("","VTCICONF3 ","","",conn);
+					errString = itmDBAccessEJB.getErrorString("","VTCONSUCF","","",conn);
 				}	
 			}
 		} 
@@ -119,7 +119,7 @@ public class BankGuaranteeConf extends ActionHandlerEJB implements BankGuarantee
 				System.out.println(">>>>>In finally errString:"+errString);
 				if(errString != null && errString.trim().length() > 0)
 				{
-					if(errString.indexOf("VTCICONF3") > -1)
+					if(errString.indexOf("VTCONSUCF") > -1)
 					{
 						conn.commit();
 						System.out.println("Commit Completed");