Confirmation for manual stk allocation.

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

webitm-dis/ibase/webitm/ejb/dis/adv/StockAllocPrc.java

@@ -50,7 +50,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 		PreparedStatement pstmt = null, pstmt1 = null ;
 		ResultSet rs = null, rs1 = null;
 		String sql = "";
-		String confirm = "";
+		String confirm = "",batchId="";
 		String errString = "" ; 
 		ConnDriver connDriver = null;
 		ITMDBAccessEJB itmDBAccessEJB = null;
@@ -78,18 +78,20 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 //			connDriver = null;
 //			conn.setAutoCommit(false);
 
-			sql = "select confirmed,site_code from sord_alloc where tran_id = ?";
+			sql = "select confirmed,site_code,BATCH_ID from sord_alloc where tran_id = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
 				confirm = rs.getString("confirmed");
+				batchId = rs.getString("BATCH_ID");
 			}
 			rs.close();
 			rs = null;
 			pstmt.close();
 			pstmt = null;
+			System.out.println("BATCH ID while validation ["+batchId+"]");
 			if(confirm != null  && "Y".equalsIgnoreCase(confirm))
 			{
 				System.out.println("The Selected transaction is already confirmed");
@@ -286,7 +288,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 		String updateSql1= null;
 		String empCode = "";
 		String dateNow ="";
-		String errString = "";
+		String errString = "",batchId="";
 		int count1 = 0 ;
 		int count2 = 0 ;
 		double qtyToBeAllocated = 0d;
@@ -354,7 +356,9 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 					+ " AND LOC_CODE = ? " ;
 			pSelSordAlloc = conn.prepareStatement(sordAllocSql);
 
-			updateSql = "UPDATE SORDALLOC SET QTY_ALLOC =  QTY_ALLOC + ? "
+			updateSql = "UPDATE SORDALLOC"
+					+ " SET QTY_ALLOC =  QTY_ALLOC + ?,"
+					+ " BATCH_ID=?  "//VALLABH KADAM UPDATE BATCH id in SORDALLOC.
 					+ " WHERE SALE_ORDER = ? "
 					+ " AND LINE_NO = ? "
 					+ " AND EXP_LEV = ? "
@@ -362,16 +366,18 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 					+ " AND ITEM_CODE = ? "
 					+ " AND LOT_NO = ? "
 					+ " AND LOT_SL = ? "
-					+ " AND LOC_CODE = ? " ;
+					+ " AND LOC_CODE = ? ";
 			pUpdSordAlloc = conn.prepareStatement(updateSql);
+			System.out.println("****UPDATE sql at confirm :-"+updateSql);
 			
 			insertSql ="INSERT INTO SORDALLOC (SALE_ORDER,LINE_NO,EXP_LEV,ITEM_CODE__ORD,SITE_CODE ,"
 					+"ITEM_CODE,QUANTITY ,LOT_NO, LOT_SL, LOC_CODE, UNIT, QTY_ALLOC,"
 					+"ITEM_REF, DATE_ALLOC, STATUS,ITEM_GRADE, EXP_DATE, ALLOC_MODE, "
 					+" CONV__QTY_STDUOM, UNIT__STD, QUANTITY__STDUOM, "
-					+"MFG_DATE, SITE_CODE__MFG, REF_ID__ALLOC, REF_LINE__NO) "  //REF_ID__ALLOC, REF_LINE__NO added by deepak sawant (24/10/13)
+					+"MFG_DATE, SITE_CODE__MFG, REF_ID__ALLOC, REF_LINE__NO,"//REF_ID__ALLOC, REF_LINE__NO added by deepak sawant (24/10/13)
+					+ " BATCH_ID) "  //VALLABH KADAM INSERT BATCH id in SORDALLOC
 					+"VALUES ( ?, ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? ,"
-					+" ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
+					+" ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) " ;
 			
 			pInsSordAlloc = conn.prepareStatement(insertSql);
 
@@ -379,7 +385,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 			getDataSql = "select  d.tran_id ,d.line_no ,d.sale_order ,d.line_no__sord ,d.item_code , "
 					+" d.loc_code ,d.lot_no ,d.lot_sl ,d.quantity ,d.dealloc_qty,h.site_code__ship , "        // replace h.site_code__ship instead of  d.site_code to get sitecodeship from header at the time of confirmation 
 					//+" d.loc_code ,d.lot_no ,d.lot_sl ,d.quantity ,d.dealloc_qty, d.site_code , "     
-					+" d.exp_lev,d.pending_qty "
+					+" d.exp_lev,d.pending_qty,h.BATCH_ID "     // VALLABH KADAM select BATCH id
 					+" from  sord_alloc_det d , sord_alloc h "
 					+" where d.tran_id = ?  and  h.tran_id =  d.tran_id  "
 					+" order by  line_no  asc   "; 
@@ -391,7 +397,6 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 			int updCount = 0;
 			while(rs.next())
 			{
-				
 				System.out.println( "INSIDE WHILE LOOP.............");
 				
 				tranIDD = rs.getString(1);   //added by deepak sawant (24/10/13)
@@ -426,6 +431,9 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 				//EXP_LEV
 				expLev = rs.getString(12);
 				pendingQuantity = rs.getDouble(13);
+				batchId = rs.getString(14);        //VALLABH KADAM find BATCH id from sord_alloc for tranId.
+				
+				System.out.println("********* BATCH ID :- ["+batchId+"] for tranId :- ["+tranId+"]************");
 
 				qtyToBeAllocated = quantity;
 
@@ -540,20 +548,23 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 						count = rsTemp.getInt(1);
 					}
 					rsTemp.close(); rsTemp = null;
+					System.out.println("SORDALLOC select :- "+count);
 					if (count > 0 )
 					{
 						//Updating the alloc quantity in SORDALLOC TABLE
 						pUpdSordAlloc.setDouble(1, qtyToBeAllocated );
-						pUpdSordAlloc.setString(2, saleOrder);
-						pUpdSordAlloc.setString(3, lineNoSord);
-						pUpdSordAlloc.setString(4, expLev);
-						pUpdSordAlloc.setString(5, itemCodeOrd);
-						pUpdSordAlloc.setString(6, itemCode);
-						pUpdSordAlloc.setString(7, lotNo);
-						pUpdSordAlloc.setString(8, lotSl);
-						pUpdSordAlloc.setString(9, locCode);
+						pUpdSordAlloc.setString(2, batchId);// VALLABH KADAM update BATCH id in SORDALLOC
+						pUpdSordAlloc.setString(3, saleOrder);
+						pUpdSordAlloc.setString(4, lineNoSord);
+						pUpdSordAlloc.setString(5, expLev);
+						pUpdSordAlloc.setString(6, itemCodeOrd);
+						pUpdSordAlloc.setString(7, itemCode);
+						pUpdSordAlloc.setString(8, lotNo);
+						pUpdSordAlloc.setString(9, lotSl);
+						pUpdSordAlloc.setString(10, locCode);
 						updCount = pUpdSordAlloc.executeUpdate();
 						pUpdSordAlloc.clearParameters();
+						System.out.println("SORDALLOC update :- "+updCount);
 						if ( updCount > 0 )
 						{
 							System.out.println("UPDATE  SUCCESS FOR SORDALLOC....");
@@ -643,6 +654,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 						pInsSordAlloc.setString(24,tranIDD); //added by deepak sawant (24/10/13)
 						
 						pInsSordAlloc.setString(25,lineNoo); //added by deepak sawant (24/10/13)
+						pInsSordAlloc.setString(26,batchId); //VALLABH KADAM INSERT BATCH id 
 						int insCnt = 0;
 						insCnt = pInsSordAlloc.executeUpdate();
 						pInsSordAlloc.clearParameters();