chnages in series condition

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

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

@@ -256,27 +256,28 @@ public String process(Document dom, Document dom2, String windowName, String xtr
  		if(siteCode.length() > 0 && itemSerFrm.length() > 0 && itemSerTo.length() > 0 && priceList.length() > 0){
  			if(itemCodeFrm.length() > 0 && itemCodeTo.length() > 0){
  				
- 				System.out.println("in actualLogic--------------");
- 				if("00".equalsIgnoreCase(itemCodeFrm) && "ZZ".equalsIgnoreCase(itemCodeTo))
- 				{
- 					sql="select item_ser from stock where site_code = ? and item_ser between ? and ? ";
+ 				System.out.println("in actualLogic1--------------");
+ 				
+ 				if("00".equalsIgnoreCase(itemSerFrm) && "ZZ".equalsIgnoreCase(itemSerTo) &&
+						 "00".equalsIgnoreCase(itemCodeFrm) && "ZZ".equalsIgnoreCase(itemCodeTo)){
+					
+					sql="select item_ser from stock where site_code = ? ";
 					pstmt=conn.prepareStatement(sql);
 	 				pstmt.setString(1, siteCode);	
- 	 				pstmt.setString(2, itemSerFrm);
- 	 				pstmt.setString(3, itemSerTo); 	 				
- 	 						
 				}else if("00".equalsIgnoreCase(itemSerFrm) && "ZZ".equalsIgnoreCase(itemSerTo)){
 					sql="select item_ser from stock where site_code = ? and item_code between ? and  ?";
 	 				pstmt=conn.prepareStatement(sql);
 	 				pstmt.setString(1, siteCode); 			
 	 				pstmt.setString(2, itemCodeFrm);
 	 				pstmt.setString(3, itemCodeTo);
- 				}else if("00".equalsIgnoreCase(itemSerFrm) && "ZZ".equalsIgnoreCase(itemSerTo) &&
- 						 "00".equalsIgnoreCase(itemCodeFrm) && "ZZ".equalsIgnoreCase(itemCodeTo)){ 					
- 					sql="select item_ser from stock where site_code = ? ";
+				}
+ 				
+ 				else if ("00".equalsIgnoreCase(itemCodeFrm) && "ZZ".equalsIgnoreCase(itemCodeTo)){
+ 					sql="select item_ser from stock where site_code = ? and item_ser between ? and ? ";
  					pstmt=conn.prepareStatement(sql);
  	 				pstmt.setString(1, siteCode);
- 					
+ 	 				pstmt.setString(2, itemSerFrm);
+ 	 				pstmt.setString(3, itemSerTo);
 				}else{
  					sql="select item_ser from stock where site_code = ? and item_ser between ? and ? "
  	 						+ "and item_code between ? and  ?";
@@ -288,8 +289,6 @@ public String process(Document dom, Document dom2, String windowName, String xtr
  	 				pstmt.setString(5, itemCodeTo);
  				}
  			
- 				
- 				
  				rs=pstmt.executeQuery();
  				while (rs.next()){
  					itemSerSet.add(rs.getString(1));