change slq for display customer details

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

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

@@ -21,34 +21,45 @@ public class CustomerDetails extends ValidatorEJB
 		try 
 		{
 			conn = getConnection();
-			
-			sql = "SELECT (SELECT COUNT(*) FROM SORDER SORDER, DESPATCH DESPATCH WHERE SORDER.CUST_CODE = ? AND SORDER.STATUS NOT IN ('C','X','H') " 
-				+ " AND DESPATCH.SORD_NO = SORDER.SALE_ORDER AND DESPATCH.CONFIRMED = 'N') AS CUSTOMER_OPEN_ORDER, CUST_PRIORITY, " 
-				+ " (SELECT COUNT(*) FROM SORDER WHERE CUST_CODE = ? AND ORDER_DATE <= SYSDATE) AS TOTAL_ORDER_TILL_DATE, CR_TERM, SALES_PERS, " 
-				+ " WAVE_TYPE, CONT_PERS, BLACK_LISTED, BLACK_LISTED_DATE, (SELECT FN_PAYAMT_CHECK(?) FROM DUAL) AS PAY_AMOUNT, " 
-				+ " (SELECT FN_OUVERDUE_CHECK(?) FROM DUAL) AS DUE_AMOUNT_TILL_DATE, CUST_NAME " 
-				+ " FROM CUSTOMER WHERE CUST_CODE = ? "; 
+			sql = "SELECT  CUSTOMER.CUST_NAME ,  CUSTOMER.CURR_CODE,(SELECT COUNT(*) FROM SORDER WHERE CUST_CODE = ? AND ORDER_DATE <= SYSDATE) AS TOTAL_ORDER_TILL_DATE, "
+			+ "  CONTACT.TELE1  AS CONTACT, CONTACT.NAME AS CONTACT_NAME, CONTACT.EMAIL_ADDR , "
+			+ " (SELECT COUNT(*) FROM SORDER SORDER, DESPATCH DESPATCH WHERE SORDER.CUST_CODE = ? AND SORDER.STATUS NOT IN ('C','X','H')  "
+				 + "	AND DESPATCH.SORD_NO = SORDER.SALE_ORDER AND DESPATCH.CONFIRMED = 'N') AS OPENORDERS, CUSTOMER.CUST_PRIORITY AS RANK, "
+			     + "     CASE WHEN CRTERM.DESCR  IS NULL THEN CUSTOMER.CR_TERM ELSE CRTERM.DESCR END AS CRTERM_DESC ,CASE WHEN DELIVERY_TERM.DESCR IS NULL THEN CUSTOMER.DLV_TERM ELSE DELIVERY_TERM.DESCR END "
+			     + "    AS DLVTERM_DESC, SALES_PERS.SP_NAME , SALES_PERS.EMAIL_ADDR AS SALES_EMAIL, CUSTOMER.BLACK_LISTED, 		CUSTOMER.BLACK_LISTED_DATE, (SELECT FN_OUVERDUE_CHECK(?) FROM DUAL) AS DUE_AMOUNT_TILL_DATE, CUSTOMER.CREDIT_LMT, CUSTOMER.WAVE_TYPE  "
+				 + "	FROM CUSTOMER  CUSTOMER, CONTACT CONTACT ,CRTERM CRTERM, DELIVERY_TERM DELIVERY_TERM, SALES_PERS SALES_PERS "
+				 + "	WHERE CUSTOMER.CONTACT_CODE = CONTACT.CONTACT_CODE "
+			     + "	AND CUSTOMER.CR_TERM = CRTERM.CR_TERM(+) "
+				 + "	AND CUSTOMER.DLV_TERM = DELIVERY_TERM.DLV_TERM(+) "
+			     + "	AND SALES_PERS.SALES_PERS = CUSTOMER.SALES_PERS(+) "
+				 + "	AND CUSTOMER.CUST_CODE = ? " ;
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, checkNull(custCode));
 			pstmt.setString(2, checkNull(custCode));
 			pstmt.setString(3, checkNull(custCode));
 			pstmt.setString(4, checkNull(custCode));
-			pstmt.setString(5, checkNull(custCode));
 			rs = pstmt.executeQuery();
 			if ( rs.next())
 			{
-				custList.add(checkNull(rs.getString("CUSTOMER_OPEN_ORDER")));
-				custList.add(checkNull(rs.getString("CUST_PRIORITY")));
+				custList.add(checkNull(rs.getString("CUST_NAME")));
+				custList.add(checkNull(rs.getString("CURR_CODE")));
 				custList.add(checkNull(rs.getString("TOTAL_ORDER_TILL_DATE")));
-				custList.add(checkNull(rs.getString("CR_TERM")));
-				custList.add(checkNull(rs.getString("SALES_PERS")));
-				custList.add(checkNull(rs.getString("WAVE_TYPE")));
-				custList.add(checkNull(rs.getString("CONT_PERS")));
+				custList.add(checkNull(rs.getString("CONTACT")));
+				custList.add(checkNull(rs.getString("EMAIL_ADDR")));
+				custList.add(checkNull(rs.getString("OPENORDERS")));
+				custList.add(checkNull(rs.getString("RANK")));
+				custList.add(checkNull(rs.getString("CRTERM_DESC")));
+				custList.add(checkNull(rs.getString("DLVTERM_DESC")));
+				custList.add(checkNull(rs.getString("SP_NAME")));
+				custList.add(checkNull(rs.getString("SALES_EMAIL")));
 				custList.add(checkNull(rs.getString("BLACK_LISTED")));
-				custList.add(checkNull(rs.getString("BLACK_LISTED_DATE")));
-				custList.add(checkNull(rs.getString("PAY_AMOUNT")));
+				custList.add(rs.getDate("BLACK_LISTED_DATE")== null?"":rs.getDate("BLACK_LISTED_DATE"));
+				System.out.println("rs.getDate(BLACK_LISTED_DATE) ::::: "+rs.getDate("BLACK_LISTED_DATE"));
 				custList.add(checkNull(rs.getString("DUE_AMOUNT_TILL_DATE")));
-				custList.add(checkNull(rs.getString("CUST_NAME")));
+				System.out.println("Due Amount");
+				custList.add(checkNull(rs.getString("CREDIT_LMT")));
+				custList.add(checkNull(rs.getString("CONTACT_NAME")));
+				custList.add(checkNull(rs.getString("WAVE_TYPE")));
 				isExists = true;
 			}
 			if(!isExists)
@@ -64,6 +75,13 @@ public class CustomerDetails extends ValidatorEJB
 				custList.add("");
 				custList.add("");
 				custList.add("");
+				custList.add("");
+				custList.add("");
+				custList.add("");
+				custList.add("");
+				custList.add("");
+				custList.add("");
+
 			}
 			if (rs != null) 
 			{					
@@ -75,7 +93,6 @@ public class CustomerDetails extends ValidatorEJB
 				pstmt.close();
 				pstmt = null;
 			}
-			
 		}
 		catch (Exception e) 
 		{