*** empty log message ***

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

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

@@ -180,7 +180,7 @@ implements CustomerLocal, CustomerRemote
 						}
 					} 
 					// Comment By Nkhan [16-SEP-16] START
-				/*	else if (childNodeName.equalsIgnoreCase("cust_name"))
+					/*	else if (childNodeName.equalsIgnoreCase("cust_name"))
 					{
 						custName = this.genericUtility.getColumnValue("cust_name", dom);
 
@@ -314,48 +314,48 @@ implements CustomerLocal, CustomerRemote
 
 						//if (acctCodeAdv != null)
 						//{
-							cnt = 0;
-							sql = "select count(*) as cnt from accounts where acct_code =?";
+						cnt = 0;
+						sql = "select count(*) as cnt from accounts where acct_code =?";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, acctCodeAdv);
+						rs = pstmt.executeQuery();
+						if (rs.next())
+						{
+							cnt = rs.getInt("cnt");
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+
+						if (cnt != 0)
+						{
+							sql = "select active from accounts where acct_code =?";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, acctCodeAdv);
 							rs = pstmt.executeQuery();
 							if (rs.next())
 							{
-								cnt = rs.getInt("cnt");
+								active = rs.getString("active");
 							}
 							rs.close();
 							rs = null;
 							pstmt.close();
 							pstmt = null;
 
-							if (cnt != 0)
-							{
-								sql = "select active from accounts where acct_code =?";
-								pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1, acctCodeAdv);
-								rs = pstmt.executeQuery();
-								if (rs.next())
-								{
-									active = rs.getString("active");
-								}
-								rs.close();
-								rs = null;
-								pstmt.close();
-								pstmt = null;
-
-								if (!active.equalsIgnoreCase("Y"))
-								{
-									errCode = "VMACCTA";
-									errList.add(errCode);
-									errFields.add(childNodeName.toLowerCase());
-								}
-							}
-							else
+							if (!active.equalsIgnoreCase("Y"))
 							{
-								errCode = "VTACCTCD1";
+								errCode = "VMACCTA";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
+						}
+						else
+						{
+							errCode = "VTACCTCD1";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
 						//} 
 						/*	Comment By Nasruddin [16-SEP-16] START
 						else
@@ -462,9 +462,9 @@ implements CustomerLocal, CustomerRemote
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-						
+
 						if ((custCodeBil.trim().length() == 0  || custCodeBil == null) && !("A".equalsIgnoreCase(keyFlag)))
-						//if ((custCodeBil != null && custCodeBil.trim().length() > 0) && !("A".equalsIgnoreCase(keyFlag))) // Comment By Nasruddin  [16-SEP-16]
+							//if ((custCodeBil != null && custCodeBil.trim().length() > 0) && !("A".equalsIgnoreCase(keyFlag))) // Comment By Nasruddin  [16-SEP-16]
 						{
 							errCode = "VEBILLTO";
 							errList.add(errCode);
@@ -537,7 +537,7 @@ implements CustomerLocal, CustomerRemote
 							errFields.add(childNodeName.toLowerCase());
 						}
 						Comment By Nasruddin [16-SEP-16] END*/
-						
+
 					}
 					else if (childNodeName.equalsIgnoreCase("terr_code"))
 					{
@@ -795,7 +795,7 @@ implements CustomerLocal, CustomerRemote
 							errFields.add(childNodeName.toLowerCase());
 						}
 						Comment By Nasruddin [16-SEP-16] END*/
-						
+
 					} 
 					else if (childNodeName.equalsIgnoreCase("cctr_code__ar"))
 					{
@@ -1102,7 +1102,7 @@ implements CustomerLocal, CustomerRemote
 						channelPartner = checkNull(genericUtility.getColumnValue("channel_partner", dom));
 
 						if ("Y".equalsIgnoreCase(channelPartner) && (siteCode == null || siteCode.trim().length() <= 0))
-						//if ("Y".equalsIgnoreCase(channelPartner) && (siteCode == null && siteCode.trim().length() <= 0)) Comment By Nasruddin [16-SEP-16]
+							//if ("Y".equalsIgnoreCase(channelPartner) && (siteCode == null && siteCode.trim().length() <= 0)) Comment By Nasruddin [16-SEP-16]
 						{
 							errCode = "VMSITECD1";
 							errList.add(errCode);
@@ -1181,8 +1181,8 @@ implements CustomerLocal, CustomerRemote
 					else if (childNodeName.equalsIgnoreCase("bank_code"))
 					{
 						bankCode = checkNull(genericUtility.getColumnValue("bank_code", dom));
-                        
-					//	if (bankCode != null) Comment By Nasruddin [16-SEP-16]
+
+						//	if (bankCode != null) Comment By Nasruddin [16-SEP-16]
 						if (bankCode != null && bankCode.trim().length() > 0)
 						{
 							cnt = 0;
@@ -1279,8 +1279,8 @@ implements CustomerLocal, CustomerRemote
 					} 
 					else if (childNodeName.equalsIgnoreCase("loss_perc"))
 					{
-						lossPerc = checkNull(genericUtility.getColumnValue("loss_perc", dom));
-						if (lossPerc.trim() != null)
+						lossPerc = genericUtility.getColumnValue("loss_perc", dom);
+						if (lossPerc != null && lossPerc.trim().length() > 0)
 						{
 							cnt1 = Integer.parseInt(lossPerc);
 						}
@@ -1313,7 +1313,7 @@ implements CustomerLocal, CustomerRemote
 					else if (childNodeName.equalsIgnoreCase("term_table__no"))
 					{
 						termTableNo = checkNull(genericUtility.getColumnValue("term_table__no", dom));
-						
+
 						//if( termTableNo != null) Changed By Nasruddin [16-sep-16]
 						if (termTableNo != null && termTableNo.trim().length() > 0)
 						{
@@ -1395,9 +1395,9 @@ implements CustomerLocal, CustomerRemote
 						}
 					}//Changed By Nasruddin khan [19/JUL/16] START
 					else if( childNodeName.equalsIgnoreCase("comm_table")){
-						
+
 						commTable = checkNull(genericUtility.getColumnValue("comm_table", dom));
-						
+
 						if( commTable != null && commTable.trim().length() > 0){
 							cnt = 0;
 
@@ -1420,16 +1420,16 @@ implements CustomerLocal, CustomerRemote
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
-						
+
 						}
 					}//Changed By Nasruddin khan [19/JUL/16] END
-					
+
 					//Changed By Nasruddin khan [16/SEP/16] START
 					else if( childNodeName.equalsIgnoreCase("disc_list"))
 					{
-						
+
 						discList = checkNull(genericUtility.getColumnValue("disc_list", dom));
-						
+
 						if( discList != null && discList.trim().length() > 0){
 							cnt = 0;
 
@@ -1452,12 +1452,12 @@ implements CustomerLocal, CustomerRemote
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
-						
+
 						}
 					}
 					//Changed By Nasruddin khan [16/SEP/16] END
-					
-					
+
+
 					// else if(childNodeName.equalsIgnoreCase("cust_code__pd")){
 					// custCodePd =
 					// checkNull(this.genericUtility.getColumnValue(
@@ -1646,7 +1646,7 @@ implements CustomerLocal, CustomerRemote
 						}
 					}
 				}
-				valueXmlString.append("</Detail1>");
+				valueXmlString.append("</Detail2>");
 			}
 			int errListSize = errList.size();
 			cnt = 0;
@@ -2406,6 +2406,7 @@ implements CustomerLocal, CustomerRemote
 			return Double.parseDouble(str);
 		}
 	}
+	
 
 	private String errorType(Connection conn, String errorCode) throws ITMException
 	{