add GTIN unit in view

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

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

@@ -277,7 +277,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				+"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
-				+" ITEM.GTIN_CASE  "   //added by Kunal on 22/10/12 
+				+" ITEM.GTIN_CASE,ITEM.GTIN_UNIT  "   //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 "
@@ -352,7 +352,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 							{
 								itemCodeMap.put(rs.getString(6),new Double(rs1.getDouble(1)));
 							}
-							System.out.println("Bal stk qty for item ....." + rs.getString(6) + " is " + balStockQty);
+							System.out.println("Bal stk qty for item ....." + rs.getString(6) + " is " + balStockQty+"  hold qty="+holdQty);
 						}
 						rs1.close();
 					}
@@ -427,20 +427,23 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 						// as this will be a input from the user							
 						itemCodeMap.put(rs.getString(6), new Double(balStockQty));
 						//PACK_INSTR
-						retTabSepStrBuff.append(rs.getString(11)).append("\t");
+						retTabSepStrBuff.append(rs.getString(11) == null? " ":rs.getString(11)).append("\t");
 						//SITE_CODE
-						retTabSepStrBuff.append(rs.getString(12)).append("\t");
+						retTabSepStrBuff.append(rs.getString(12) == null?" ":rs.getString(12)).append("\t");
 						//EXP_LEV
-						retTabSepStrBuff.append(rs.getString(13)).append("\t");
+						retTabSepStrBuff.append(rs.getString(13) == null?" " :rs.getString(13) ).append("\t");
 
 						//Hold Flag
-						retTabSepStrBuff.append(rs.getString(14)).append("\t");// ADDED BY AKHILESH
+						retTabSepStrBuff.append(rs.getString(14) == null?"N":rs.getString(14)).append("\t");// ADDED BY AKHILESH
+						//qty allocated
+						retTabSepStrBuff.append(rs.getDouble(10)).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
+						retTabSepStrBuff.append(rs.getString(15)== null?" ":rs.getString(15)).append("\t");// added by Kunal on 22/10/12
+						//Gtin Unit
+						retTabSepStrBuff.append(rs.getString(16) == null?" ":rs.getString(16)).append("\t");// added by Kunal on 25/10/12
+						
 
 						retTabSepStrBuff.append("\n");
 					}

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

@@ -286,7 +286,7 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						   +" 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, "
-					       +" ITEM.GTIN_CASE,SORDITEM.ITEM_CODE,SORDER.SITE_CODE__SHIP  "   //added by Kunal on 22/10/12
+					       +" ITEM.GTIN_CASE,SORDITEM.ITEM_CODE,SORDER.SITE_CODE__SHIP ,ITEM.GTIN_UNIT "   //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 "
@@ -386,7 +386,9 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						//hold qty
 						retTabSepStrBuff.append(holdQty).append("\t");
 						//gtin_case
-						retTabSepStrBuff.append(rs.getString(11)).append("\n");
+						retTabSepStrBuff.append(rs.getString(11)== null ?"": rs.getString(11)).append("\t");
+						//gtin_unit
+						retTabSepStrBuff.append(rs.getString(14) == null ?" ":rs.getString(14) ).append("\n"); //added by Kunal on 25/10/12
 
 						resultString = retTabSepStrBuff.toString();
 						pstmt.clearParameters();
@@ -404,7 +406,7 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						   +"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 ,"
-						   +"  ITEM.GTIN_CASE , SORDITEM.ITEM_CODE,SORDER.SITE_CODE__SHIP "   //added by Kunal on 22/10/12
+						   +"  ITEM.GTIN_CASE , SORDITEM.ITEM_CODE,SORDER.SITE_CODE__SHIP,ITEM.GTIN_UNIT "   //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 "
@@ -436,6 +438,8 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				pstmtDeAlloc.setTimestamp(9,dateTo);
 				pstmtDeAlloc.setString(10,itemCodeFr);
 				pstmtDeAlloc.setString(11,itemCodeTo);
+				
+				st = conn.createStatement();
 				rsDealloc = pstmtDeAlloc.executeQuery();
 				if(rsDealloc.next())
 				{
@@ -451,7 +455,7 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 								+"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);
+							rs1 = st.executeQuery(sql);
 							if (rs1.next())
 							{
 								
@@ -496,7 +500,9 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						//hold qty
 						retTabSepStrBuff.append(holdQty).append("\t");
 						//gtin_case
-						retTabSepStrBuff.append(rsDealloc.getString(11)).append("\n");
+						retTabSepStrBuff.append(rsDealloc.getString(11) == null ?" ":rsDealloc.getString(11)).append("\t"); 
+						//gtin_unit
+						retTabSepStrBuff.append(rsDealloc.getString(14) == null ?" ":rsDealloc.getString(14)).append("\n"); //added by Kunal on 25/10/12
 
 						resultString = retTabSepStrBuff.toString();