change in getdata query

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

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

@@ -138,7 +138,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 		String resrvLoc = "",casePickLoc = "",activePickLoc = "" ,deepStoreLoc = "" ,partialResrvLoc = "";//added by kunal on 15/NOV/13
 		String orderByStkStr = "" , disOpt = "";
 		int waveType1 = 0;
-		double pendingQty = 0;
+		double pendingQty = 0, minSelfLife = 0;
 		Connection conn = null;
 		ResultSet rs = null;
 		ResultSet rs1 = null;
@@ -388,6 +388,37 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				{
 
 					System.out.println("Processing Item ....." + rs.getString(6) );
+					//added by ritesh 0n 7/8/13  for request DI3ESUN009 START
+					sql1 = " select wave_type from customer where cust_code = ? ";
+					pstmt2 = conn.prepareStatement(sql1);
+					pstmt2.setString(1,rs.getString("CUST_CODE__DLV"));
+					rs2 = pstmt2.executeQuery();
+					if(rs2.next())
+					{
+						waveType = rs2.getString("wave_type");
+					}
+					rs2.close();
+					rs2 = null;
+					pstmt2.close();
+					pstmt2 = null;
+					sql1 = " select case when ACTIVE_PICK_ALLOW is null then 'Y' else ACTIVE_PICK_ALLOW end as ACTIVE_PICK_ALLOW from wave_type where wave_type = ? ";
+					pstmt2 = conn.prepareStatement(sql1);
+					pstmt2.setString(1,waveType);
+					rs2 = pstmt2.executeQuery();
+					if(rs2.next())
+					{
+						activeAllow = rs2.getString("ACTIVE_PICK_ALLOW");
+					}
+					else
+					{
+						activeAllow = "Y";
+					}
+					rs2.close();
+					rs2 = null;
+					pstmt2.close();
+					pstmt2 = null;	
+					//added by ritesh 0n 7/8/13  for request DI3ESUN009 END
+
 					if(itemCodeMap.containsKey(rs.getString(6)) )
 					{						
 						balStockQty = Double.parseDouble(itemCodeMap.get(rs.getString(6)).toString());
@@ -399,6 +430,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 
 						if(checkLocation)
 						{
+
 							sql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
 									+"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
 									+"ITEM.DESCR,SORDITEM.QUANTITY,"
@@ -460,6 +492,21 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 								orderByStkStr = " AND LOCATION.INV_STAT IN(?,?,?,?) ";
 							}
 						}
+						minSelfLife = 0;
+						sql =" SELECT MIN_SHELF_LIFE  FROM SORDITEM WHERE SALE_ORDER = ?  AND LINE_NO = ?  AND EXP_LEV = ? "; 
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1,rs.getString(4));
+						pstmt1.setString(2, rs.getString(3));
+						pstmt1.setString(3, rs.getString(13));
+						rs1 = pstmt1.executeQuery();
+						if(rs1.next())
+						{
+							minSelfLife= rs1.getDouble("MIN_SHELF_LIFE");
+						}
+						rs1.close();
+						rs1 = null;
+						pstmt1.close();
+						pstmt1 = null;
 
 						sql1 ="SELECT SUM(STOCK.QUANTITY - case when STOCK.ALLOC_QTY is null then 0 else STOCK.ALLOC_QTY end - case when STOCK.HOLD_QTY is null then 0 else STOCK.HOLD_QTY end  ),SUM(case when STOCK.HOLD_QTY is null then 0 else STOCK.HOLD_QTY end ) " 
 								+"FROM STOCK,ITEM,LOCATION,INVSTAT " 
@@ -469,7 +516,17 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 								+"AND INVSTAT.AVAILABLE = 'Y' "
 								+"AND STOCK.ITEM_CODE = ? "
 								+"AND STOCK.SITE_CODE = ? " 
-							+"AND (STOCK.QUANTITY - case when STOCK.ALLOC_QTY is null then 0 else STOCK.ALLOC_QTY end - case when STOCK.HOLD_QTY is null then 0 else STOCK.HOLD_QTY end ) > 0  ";
+								+"AND (STOCK.QUANTITY - case when STOCK.ALLOC_QTY is null then 0 else STOCK.ALLOC_QTY end - case when STOCK.HOLD_QTY is null then 0 else STOCK.HOLD_QTY end ) > 0   "
+								+"AND NOT EXISTS (SELECT 1 FROM INV_RESTR I WHERE I.INV_STAT = INVSTAT.INV_STAT AND I.REF_SER = 'S-DSP' ) "; //added by kunal on 20/NOV/13 SAME COND. FOR GETDATA AND PROCESS 
+
+						if("N".equalsIgnoreCase(activeAllow))//added by kunal on 20/NOV/13 SAME COND. FOR GETDATA AND PROCESS
+						{
+							sql1 = sql1.concat(" AND LOCATION.INV_STAT NOT IN(?,?) ");
+						}
+						//Added by manoj dtd 09/08/2013 to implement FEFO concept  
+						sql1= sql1+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
+
+
 						// 01/11/12 manoharan preparedstatement used instead of statement
 						//rs1 = st.executeQuery(sql);
 
@@ -480,16 +537,38 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 						pstmt1 = conn.prepareStatement(sql1);
 						pstmt1.setString(1,rs.getString(6) );
 						pstmt1.setString(2,rs.getString(12));
+						pstmt1.setDouble(3,minSelfLife);
+						if("N".equalsIgnoreCase(activeAllow))
+						{
+							pstmt1.setString(3,activePickLoc);
+							pstmt1.setString(4,partialResrvLoc);
+							pstmt1.setDouble(5,minSelfLife);
 							if(checkLocation) //added by kunal on 15/NOV/13  DI3ESUN009
 							{
-							pstmt1.setString(3,resrvLoc);
-							pstmt1.setString(4,casePickLoc);
-							pstmt1.setString(5,activePickLoc);
-							pstmt1.setString(6,deepStoreLoc);
+								pstmt1.setString(6,resrvLoc);
+								pstmt1.setString(7,casePickLoc);
+								pstmt1.setString(8,activePickLoc);
+								pstmt1.setString(9,deepStoreLoc);
 								if(isActives)
 								{
-								pstmt1.setString(7,partialResrvLoc);
+									pstmt1.setString(10,partialResrvLoc);
+								}
+							}
 						}
+						else
+						{
+							if(checkLocation) //added by kunal on 15/NOV/13  DI3ESUN009
+							{
+								pstmt1.setString(4,resrvLoc);
+								pstmt1.setString(5,casePickLoc);
+								pstmt1.setString(6,activePickLoc);
+								pstmt1.setString(7,deepStoreLoc);
+								if(isActives)
+								{
+									pstmt1.setString(8,partialResrvLoc);
+								}
+							}
+
 						}
 						rs1 = pstmt1.executeQuery();
 
@@ -627,36 +706,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 							//retTabSepStrBuff.append("0").append("\t");
 							retTabSepStrBuff.append("<qty_alloc>").append("<![CDATA[" + 0 +"]]>").append("</qty_alloc>");
 						}
-										//added by ritesh 0n 7/8/13  for request DI3ESUN009 START
-						sql1 = " select wave_type from customer where cust_code = ? ";
-						pstmt2 = conn.prepareStatement(sql1);
-						pstmt2.setString(1,rs.getString("CUST_CODE__DLV"));
-					    rs2 = pstmt2.executeQuery();
-						if(rs2.next())
-						{
-							waveType = rs2.getString("wave_type");
-						}
-						rs2.close();
-						rs2 = null;
-						pstmt2.close();
-						pstmt2 = null;
-						sql1 = " select case when ACTIVE_PICK_ALLOW is null then 'Y' else ACTIVE_PICK_ALLOW end as ACTIVE_PICK_ALLOW from wave_type where wave_type = ? ";
-						pstmt2 = conn.prepareStatement(sql1);
-						pstmt2.setString(1,waveType);
-					    rs2 = pstmt2.executeQuery();
-						if(rs2.next())
-						{
-							retTabSepStrBuff.append("<active_pick_allow>").append("<![CDATA[" + rs2.getString("ACTIVE_PICK_ALLOW") +"]]>").append("</active_pick_allow>");
-						}
-						else
-						{
-							retTabSepStrBuff.append("<active_pick_allow>").append("<![CDATA[Y]]>").append("</active_pick_allow>");
-						}
-						rs2.close();
-						rs2 = null;
-						pstmt2.close();
-						pstmt2 = null;	
-									//added by ritesh 0n 7/8/13  for request DI3ESUN009 END
+
+						//active_pick_allow
+						retTabSepStrBuff.append("<active_pick_allow>").append("<![CDATA[" + activeAllow +"]]>").append("</active_pick_allow>");
+
 						//qty allocated												
 						//retTabSepStrBuff.append(rs.getDouble(10)).append("\t");// ADDED BY AKHILESH
 						retTabSepStrBuff.append("<qty_allocated>").append("<![CDATA[" + (rs.getDouble(10)) +"]]>").append("</qty_allocated>");
@@ -1369,7 +1422,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 
 			if("N".equalsIgnoreCase(activeAllow))
 			{
-					getDataSql = getDataSql.concat(" AND LOCATION.INV_STAT NOT IN(?,?)");
+				getDataSql = getDataSql.concat(" AND LOCATION.INV_STAT NOT IN(?,?) ");
 			}
 			//Added by manoj dtd 09/08/2013 to implement FEFO concept  
 			getDataSql=getDataSql+"AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";