set holt qty and GTIN in brow window

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

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

@@ -51,6 +51,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 	String sDateTo = null;
 	String sDateFr = null;
 	double balStockQty = 0;
+	double holdQty = 0;
 
 	java.sql.Timestamp dateTo =  null;
 	java.sql.Timestamp dueDate =  null;
@@ -275,7 +276,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				+"SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC PENDING_QUANTITY,"
 				+"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
 				+"SORDER.SITE_CODE__SHIP,SORDITEM.EXP_LEV , "
-				+"CASE WHEN SORDDET.HOLD_FLAG IS NULL THEN 'N' ELSE SORDDET.HOLD_FLAG END "// ADDED BY AKHILESH FOR NEW COLUNM
+				+"CASE WHEN SORDDET.HOLD_FLAG IS NULL THEN 'N' ELSE SORDDET.HOLD_FLAG END, "// ADDED BY AKHILESH FOR NEW COLUNM
+				+" ITEM.GTIN_CASE  "   //added by Kunal on 22/10/12 
 				+"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM  "
 				+"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
 				+"( SORDITEM.SALE_ORDER = SORDER.SALE_ORDER ) AND "
@@ -283,6 +285,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				+"( SORDITEM.ITEM_CODE = ITEM.ITEM_CODE ) AND "
 				+"( SORDER.CUST_CODE = CUSTOMER.CUST_CODE ) AND  "
 				+"( SORDDET.SITE_CODE = SORDITEM.SITE_CODE ) AND  "
+				
 				+" SORDER.SITE_CODE = ? AND "
 				+" ITEM.ITEM_SER >=? AND "
 				+" ITEM.ITEM_SER <=? AND "  
@@ -295,7 +298,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				+" SORDITEM.ITEM_CODE >= ? AND "
 				+" SORDITEM.ITEM_CODE <= ?  " 
 				+"AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
-				+"AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end = 'P' " 
+				+"AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end  IN ('P','H') "  //change done by Kunal on 22/10/12 as per S Manoharan instruction ,consider Hold status  
 				+"AND SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 "
 				+"AND SORDITEM.LINE_TYPE = 'I' "
 				+"ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD"; 
@@ -330,7 +333,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 					}
 					else
 					{
-						sql ="SELECT SUM(STOCK.QUANTITY - STOCK.ALLOC_QTY ) " 
+						sql ="SELECT SUM(STOCK.QUANTITY - STOCK.ALLOC_QTY ),SUM(STOCK.HOLD_QTY ) " 
 							+"FROM STOCK,ITEM,LOCATION,INVSTAT " 
 							+"WHERE (ITEM.ITEM_CODE = STOCK.ITEM_CODE) "
 							+"AND (LOCATION.LOC_CODE = STOCK.LOC_CODE ) "
@@ -344,6 +347,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 						{
 							bappend = true;
 							balStockQty = rs1.getDouble(1);
+							holdQty = rs1.getDouble(2); //added by Kunal on 22/10/12 
 							if (balStockQty > 0)
 							{
 								itemCodeMap.put(rs.getString(6),new Double(rs1.getDouble(1)));
@@ -431,6 +435,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 
 						//Hold Flag
 						retTabSepStrBuff.append(rs.getString(14)).append("\t");// ADDED BY AKHILESH
+						//Hold Qty
+						retTabSepStrBuff.append(holdQty).append("\t");// added by Kunal on 22/10/12
+						//Gtin Case
+						retTabSepStrBuff.append(rs.getDouble(15)).append("\t");// added by Kunal on 22/10/12
 						//qty allocated
 						retTabSepStrBuff.append(rs.getDouble(10)).append("\t");// ADDED BY AKHILESH
 

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

@@ -121,8 +121,26 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 		String getDataSql= "";
 		String resultString = "";
 		String sqlDealloc ="";
+		//added by Kunal on 22/10/12 start
+		String itemSerFr = "";
+		String itemSerTo = "";
+		String DefaultQtyFlag= "";
+		String itemCodeFr = "";
+		String itemCodeTo = "";
+		String postOrderFg = "";
+		String sDateTo = "";
+		String sDateFr = "";
+		String sql = "";
+		double balStockQty = 0;
+		double holdQty = 0;
+		java.sql.Timestamp dateTo =  null;
+		java.sql.Timestamp dueDate =  null;
+		java.sql.Timestamp dateFr =  null;
+		//added by Kunal on 22/10/12 end
+
+		
 		Connection conn = null;
-		ResultSet rs=null,rsDealloc= null;
+		ResultSet rs=null,rsDealloc= null,rs1=null;
 		PreparedStatement pstmt = null ,pstmtDeAlloc=null;
 		Statement st = null;
 		StringBuffer retTabSepStrBuff = new StringBuffer();
@@ -181,13 +199,95 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				return resultString;
 
          	}
+         	//added by Kunal on 22/10/12
+         	postOrderFg = genericUtility.getColumnValue("post_order_flag",headerDom);
+			if(postOrderFg == null || postOrderFg.trim().length() == 0)
+			{
+				postOrderFg = "";
+				System.out.println("Site Code From is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			itemSerFr = genericUtility.getColumnValue("item_ser__from",headerDom);
+			if ( itemSerFr == null || itemSerFr.trim().length() == 0 )
+			{
+				itemSerFr = "";
+				System.out.println("Item Series From is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			System.out.println("Item Ser FR "+ itemSerFr);
+			itemSerTo = genericUtility.getColumnValue("item_ser__to",headerDom);
+			if ( itemSerTo == null || itemSerTo.trim().length() == 0 )
+			{
+				itemSerTo = "";
+				System.out.println("Item Series To is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			itemCodeFr = genericUtility.getColumnValue("item_code__from",headerDom);
+			if ( itemCodeFr == null || itemCodeFr.trim().length() == 0 )
+			{
+				itemCodeFr = "";
+				System.out.println("Item Code From is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			System.out.println("Item Code FR "+ itemCodeFr);
+			itemCodeTo = genericUtility.getColumnValue("item_code__to",headerDom);
+			if ( itemCodeTo == null || itemCodeTo.trim().length() == 0 )
+			{
+				itemCodeTo = "";
+				System.out.println("Item Code To is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			System.out.println("Item Ser To"+itemSerTo);
+			
+			sDateFr = genericUtility.getColumnValue("due_date__from",headerDom);
+			if ( sDateFr == null || sDateFr.trim().length() == 0 )
+			{
+				sDateFr = "";
+				System.out.println("Date From is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			System.out.println("due_date__from"+sDateFr);
+			sDateFr = genericUtility.getValidDateString(sDateFr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
+			dateFr = java.sql.Timestamp.valueOf(sDateFr + " 00:00:00");
+
+			sDateTo = genericUtility.getColumnValue("due_date__to",headerDom);            
+			if ( sDateTo == null || sDateTo.trim().length() == 0 )
+			{
+				sDateTo = "";
+				System.out.println("Date To is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			System.out.println("due_date__to"+sDateTo);
+			
+			sDateTo = genericUtility.getValidDateString(sDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
+			dateTo = java.sql.Timestamp.valueOf(sDateTo + " 00:00:00");
+
+			DefaultQtyFlag = genericUtility.getColumnValue("default_qty_flag",headerDom);
+			if(DefaultQtyFlag == null || DefaultQtyFlag.trim().length() == 0)
+			{
+				DefaultQtyFlag = "";
+				System.out.println("Default Qty flag is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			
+			//added by Kunal on 22/10/12 
+			
 			if(	saleOrderFr.trim().length()>0 && saleOrderTo.trim().length()>0)
 			{
 				getDataSql = "SELECT SORDALLOC.SALE_ORDER,SORDDET.LINE_NO,SORDITEM.EXP_LEV ,"
 						   +" SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY,"
 					       +" SORDALLOC.QTY_ALLOC   PENDING_QUANTITY," //SORDITEM.QTY_ALLOC - SORDITEM.QTY_DESP  PENDING_QUANTITY,"
-					       +" SORDALLOC.LOT_NO,SORDALLOC.LOT_SL,SORDALLOC.LOC_CODE "
-					       +" FROM SORDDET,SORDALLOC,SORDITEM,CUSTOMER,ITEM, SORDER "
+					       +" SORDALLOC.LOT_NO,SORDALLOC.LOT_SL,SORDALLOC.LOC_CODE, "
+					       +" ITEM.GTIN_CASE,SORDITEM.ITEM_CODE,SORDER.SITE_CODE__SHIP  "   //added by Kunal on 22/10/12
+					       +" FROM SORDDET,SORDALLOC,SORDITEM,CUSTOMER,ITEM, SORDER  "
 						   +" WHERE SORDER.SALE_ORDER = SORDDET.SALE_ORDER AND "
 						   +"(SORDALLOC.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
 						   +"( SORDALLOC.LINE_NO = SORDDET.LINE_NO ) AND "
@@ -198,7 +298,15 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						   +"( SORDER.CUST_CODE = CUSTOMER.CUST_CODE ) AND "
 						   +" SORDDET.SITE_CODE = ? AND "
 						   +" SORDER.SALE_ORDER >= ? AND "
-						   +" SORDER.SALE_ORDER <= ? "
+						   +" SORDER.SALE_ORDER <= ? AND "
+						   +" ITEM.ITEM_SER >=? AND "
+							+" ITEM.ITEM_SER <=? AND "  
+							+" CUSTOMER.CUST_CODE >=? AND "
+							+" CUSTOMER.CUST_CODE <=? AND "  
+							+" SORDER.DUE_DATE >=  ?  AND" 
+							+" SORDER.DUE_DATE <= ?  AND "
+							+" SORDITEM.ITEM_CODE >= ? AND "
+							+" SORDITEM.ITEM_CODE <= ?  "
 						   +"AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end = 'P' "
 						   +"AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
 						   +"AND CASE WHEN SORDALLOC.STATUS IS NULL THEN 'P' ELSE SORDALLOC.STATUS end = 'P' "
@@ -209,6 +317,15 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				pstmt.setString(1,siteCode);
 				pstmt.setString(2,saleOrderFr);
 				pstmt.setString(3,saleOrderTo);
+				pstmt.setString(4,itemSerFr);
+				pstmt.setString(5,itemSerTo);
+				pstmt.setString(6,custCodeFr);
+				pstmt.setString(7,custCodeTo);
+				pstmt.setTimestamp(8,dateFr);
+				pstmt.setTimestamp(9,dateTo);
+				pstmt.setString(10,itemCodeFr);
+				pstmt.setString(11,itemCodeTo);
+				
 				st = conn.createStatement();
 				rs = pstmt.executeQuery();
 
@@ -216,6 +333,27 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				{
 					do
 					{
+						sql ="SELECT SUM(STOCK.HOLD_QTY ) " 
+								+"FROM STOCK,ITEM,LOCATION,INVSTAT " 
+								+"WHERE (ITEM.ITEM_CODE = STOCK.ITEM_CODE) "
+								+"AND (LOCATION.LOC_CODE = STOCK.LOC_CODE ) "
+								+"AND (LOCATION.INV_STAT = INVSTAT.INV_STAT) "
+								+"AND INVSTAT.AVAILABLE = 'Y' "
+								+"AND STOCK.ITEM_CODE = '"+ rs.getString(12) + "'"
+								+"AND STOCK.SITE_CODE = '"+ rs.getString(13) +"'" 
+								+"AND (STOCK.QUANTITY - STOCK.ALLOC_QTY) > 0  ";
+							rs1 = st.executeQuery(sql);
+							if (rs1.next())
+							{
+								
+								//balStockQty = rs1.getDouble(1);
+								holdQty = rs1.getDouble(1);  
+								
+								System.out.println("  holdQty"+holdQty);
+								
+								
+							}
+							rs1.close();
 
 						//SALE_ORDER
 						retTabSepStrBuff.append(rs.getString(1)).append("\t");
@@ -244,7 +382,11 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						//ALLOC_LINENO
 						retTabSepStrBuff.append(" ").append("\t");
 
-						retTabSepStrBuff.append("  ").append("\n");
+						retTabSepStrBuff.append("  ").append("\t");
+						//hold qty
+						retTabSepStrBuff.append(holdQty).append("\t");
+						//gtin_case
+						retTabSepStrBuff.append(rs.getString(11)).append("\n");
 
 						resultString = retTabSepStrBuff.toString();
 						pstmt.clearParameters();
@@ -261,25 +403,66 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				sqlDealloc= "SELECT SORD_ALLOC.CUST_CODE,SORD_ALLOC_DET.ITEM_CODE, ITEM.DESCR, SORD_ALLOC_DET.QUANTITY,"
 						   +"SORD_ALLOC_DET.QUANTITY - SORD_ALLOC_DET.DEALLOC_QTY PENDING_QUANTY ,"
 						   +"SORD_ALLOC_DET.LOT_NO,SORD_ALLOC_DET.LOT_SL,SORD_ALLOC_DET.LOC_CODE , "
-						   +"SORD_ALLOC_DET.TRAN_ID,SORD_ALLOC_DET.LINE_NO "
-						   +"FROM SORD_ALLOC,SORD_ALLOC_DET, ITEM  "
-						   +"WHERE SORD_ALLOC.TRAN_ID = SORD_ALLOC_DET.TRAN_ID "
-						   +"AND SORD_ALLOC_DET.ITEM_CODE = ITEM.ITEM_CODE "
+						   +"SORD_ALLOC_DET.TRAN_ID,SORD_ALLOC_DET.LINE_NO ,"
+						   +"  ITEM.GTIN_CASE , SORDITEM.ITEM_CODE,SORDER.SITE_CODE__SHIP "   //added by Kunal on 22/10/12
+						   +" FROM SORD_ALLOC,SORD_ALLOC_DET, ITEM  "
+						   +" WHERE SORD_ALLOC.TRAN_ID = SORD_ALLOC_DET.TRAN_ID "
+						   +" AND SORD_ALLOC_DET.ITEM_CODE = ITEM.ITEM_CODE "
 						   +"AND SORD_ALLOC.SALE_ORDER IS NULL "
 						   +"AND SORD_ALLOC.SITE_CODE= ? "
-						   +"AND SORD_ALLOC.CUST_CODE >=? AND SORD_ALLOC.CUST_CODE <=? "
+						   +"AND SORD_ALLOC.CUST_CODE >=? AND SORD_ALLOC.CUST_CODE <=?  "
+						   +"AND SORDER.SALE_ORDER >= ? AND "
+						   +" SORDER.SALE_ORDER <= ? AND "
+						   +" ITEM.ITEM_SER >=? AND "
+							+" ITEM.ITEM_SER <=? AND "  
+							+" CUSTOMER.CUST_CODE >=? AND "
+							+" CUSTOMER.CUST_CODE <=? AND "  
+							+" SORDER.DUE_DATE >=  ?  AND" 
+							+" SORDER.DUE_DATE <= ?  AND "
+							+" SORDITEM.ITEM_CODE >= ? AND "
+							+" SORDITEM.ITEM_CODE <= ?  "
 		   				   +"AND SORD_ALLOC_DET.QUANTITY -(CASE WHEN SORD_ALLOC_DET.DEALLOC_QTY IS NULL THEN 0  ELSE SORD_ALLOC_DET.DEALLOC_QTY END) > 0 ";
 
 		  		pstmtDeAlloc = conn.prepareStatement(sqlDealloc);
 		  		pstmtDeAlloc.setString(1,siteCode);
 				pstmtDeAlloc.setString(2,custCodeFr);
 				pstmtDeAlloc.setString(3,custCodeTo);
+				pstmtDeAlloc.setString(4,saleOrderFr);
+				pstmtDeAlloc.setString(5,saleOrderTo);
+				pstmtDeAlloc.setString(6,itemSerFr);
+				pstmtDeAlloc.setString(7,itemSerTo);
+				
+				pstmtDeAlloc.setTimestamp(8,dateFr);
+				pstmtDeAlloc.setTimestamp(9,dateTo);
+				pstmtDeAlloc.setString(10,itemCodeFr);
+				pstmtDeAlloc.setString(11,itemCodeTo);
 				rsDealloc = pstmtDeAlloc.executeQuery();
 				if(rsDealloc.next())
 				{
 
 					do
 					{
+						sql ="SELECT SUM(STOCK.HOLD_QTY ) " 
+								+"FROM STOCK,ITEM,LOCATION,INVSTAT " 
+								+"WHERE (ITEM.ITEM_CODE = STOCK.ITEM_CODE) "
+								+"AND (LOCATION.LOC_CODE = STOCK.LOC_CODE ) "
+								+"AND (LOCATION.INV_STAT = INVSTAT.INV_STAT) "
+								+"AND INVSTAT.AVAILABLE = 'Y' "
+								+"AND STOCK.ITEM_CODE = '"+ rsDealloc.getString(12) + "'"
+								+"AND STOCK.SITE_CODE = '"+ rsDealloc.getString(13) +"'" 
+								+"AND (STOCK.QUANTITY - STOCK.ALLOC_QTY) > 0  ";
+							rs1 = pstmtDeAlloc.executeQuery(sql);
+							if (rs1.next())
+							{
+								
+								//balStockQty = rs1.getDouble(1);
+								holdQty = rs1.getDouble(1);  
+								
+								System.out.println("  holdQty"+holdQty);
+								
+								
+							}
+							rs1.close();
 
 						//SALE_ORDER
 						retTabSepStrBuff.append(" ").append("\t");
@@ -308,7 +491,12 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						//ALLOC_LINENO
 						retTabSepStrBuff.append(rsDealloc.getString(10)).append("\t");
 
-						retTabSepStrBuff.append("  ").append("\n");
+						retTabSepStrBuff.append("  ").append("\t");
+						
+						//hold qty
+						retTabSepStrBuff.append(holdQty).append("\t");
+						//gtin_case
+						retTabSepStrBuff.append(rsDealloc.getString(11)).append("\n");
 
 						resultString = retTabSepStrBuff.toString();