insert reason code inv_hold_det for partial stock transfer

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

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

@@ -120,7 +120,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 		PreparedStatement pstmtUpd = null, pstmtHold = null, pstmtRel = null,pstmtQC = null,pstmtStTr=null,pstmt1=null;
 		ResultSet rsHold = null, rsRel = null, rsQC = null,rsStTr=null,rs1=null;
 		String tranIdHold = "", sqlRel  = "", sqlHold = "",nearExpLoc = "", sqlQC = "",sql1="";
-		String partialUsed = "";
+		String partialUsed = "" ,locCodeInvHold = "" ,lotSlInvHold = "" ,reasonCodeInvHold = "";
 		int lineNoHold = 0, qcCount = 0;
 		// end 16/10/11 manoharan
 		String partialGrlLoc = ""; //added by Ashish Sonawane on 05/SEP/12 for partial GRL location Inventory Status. 
@@ -762,7 +762,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 							//sqlHold = "SELECT  D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, "
 							sqlHold = "SELECT DISTINCT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, "
 									+ " D.ITEM_CODE AS ITEM_CODE, D.SITE_CODE AS SITE_CODE, "
-									+ " D.LOC_CODE AS LOC_CODE, D.LOT_NO AS LOT_NO,  D.LOT_SL AS LOT_SL "
+									+ " D.LOC_CODE AS LOC_CODE, D.LOT_NO AS LOT_NO,  D.LOT_SL AS LOT_SL ,D.REAS_CODE " //ADDED BY KUNAL ON 23/MAY/14 ADD REAS_CODE 
 									//Changed By Rohan on 18-07-13 for getting lock_code
 									//+ " FROM INV_HOLD_DET D, INV_HOLD H "
 									//Changed by Rohan on 06-08-13 to get hold qty
@@ -772,14 +772,19 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 									//Changed By Rohan on 18-07-13 for getting lock_code
 									+ " AND T.REF_NO = D.TRAN_ID "
 									//Chnaged by Rohan on 09-08-13 for add join of inv hold det and inv hold rel trace.start
-									+" AND D.ITEM_CODE = T.ITEM_CODE AND D.SITE_CODE = T.SITE_CODE "  
-									+" AND D.LOC_CODE = T.LOC_CODE AND D.LOT_NO = T.LOT_NO AND D.LOT_SL = T.LOT_SL " 
+									//change by kunal on 29/may/14 check null value for join
+									+" AND (D.ITEM_CODE = T.ITEM_CODE or (d.item_code is null or length(trim(d.item_code)) = 0 ) )"
+									+" AND (D.SITE_CODE = T.SITE_CODE or (d.site_code is null or length(trim(d.site_code)) = 0 ) )"  
+									+" AND (D.LOC_CODE = T.LOC_CODE  or (d.loc_code is null or length(trim(d.loc_code)) = 0 ) )"
+									+" AND (D.LOT_NO = T.LOT_NO  or (d.lot_no is null or length(trim(d.lot_no)) = 0 ) )"
+									+" AND (D.LOT_SL = T.LOT_SL or (d.lot_sl is null or length(trim(d.lot_sl)) = 0 ) )" 
 									//Chnaged by Rohan on 09-08-13 for add join of inv hold det and inv hold rel trace.end
-									+ " AND ((D.ITEM_CODE = ? ) OR (D.ITEM_CODE IS NULL OR LENGTH(TRIM(D.ITEM_CODE)) = 0 ) ) "
-									+ " AND ((D.SITE_CODE = ? ) OR (D.SITE_CODE IS NULL OR LENGTH(TRIM(D.SITE_CODE)) = 0 ) ) "
-									+ " AND ((D.LOC_CODE = ? ) OR (D.LOC_CODE IS NULL OR LENGTH(TRIM(D.LOC_CODE)) = 0 ) ) "
-									+ " AND ((D.LOT_NO = ? ) OR (D.LOT_NO IS NULL OR LENGTH(TRIM(D.LOT_NO)) = 0 ) ) "
-									+ " AND ((D.LOT_SL = ? ) OR (D.LOT_SL IS NULL OR LENGTH(TRIM(D.LOT_SL)) = 0 ) ) "
+									//change done by kunal on 30/may/14 add conditiob for INV_HOLD_REL_TRACE table
+									+ " AND ((T.ITEM_CODE = ? ) OR (T.ITEM_CODE IS NULL OR LENGTH(TRIM(T.ITEM_CODE)) = 0 ) ) "
+									+ " AND ((T.SITE_CODE = ? ) OR (T.SITE_CODE IS NULL OR LENGTH(TRIM(T.SITE_CODE)) = 0 ) ) "
+									+ " AND ((T.LOC_CODE = ? ) OR (T.LOC_CODE IS NULL OR LENGTH(TRIM(T.LOC_CODE)) = 0 ) ) "
+									+ " AND ((T.LOT_NO = ? ) OR (T.LOT_NO IS NULL OR LENGTH(TRIM(T.LOT_NO)) = 0 ) ) "
+									+ " AND ((T.LOT_SL = ? ) OR (T.LOT_SL IS NULL OR LENGTH(TRIM(T.LOT_SL)) = 0 ) ) "
 									+ " AND D.HOLD_STATUS = 'H'"
 									+ " AND H.CONFIRMED  = 'Y' ";
 							pstmtHold = conn.prepareStatement(sqlHold);
@@ -816,6 +821,11 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 								lockCode = checkNull(rsHold.getString("LOCK_CODE"));
 								//Changed by Rohan on 06-08-13 to get hold qty
 								holdQty = rsHold.getDouble("HOLD_QTY");
+								
+								locCodeInvHold = checkNull(rsHold.getString("LOC_CODE"));
+								lotSlInvHold = checkNull(rsHold.getString("LOT_SL"));
+								reasonCodeInvHold = checkNull(rsHold.getString("REAS_CODE"));
+								System.out.println("inv hold loc code="+locCodeInvHold+"@"+lotSlInvHold+"@"+reasonCodeInvHold);
 								System.out.println("invStatLocCodeTo"+invStatLocCodeTo+"locCodeTo"+locCodeTo);
 								System.out.println("Current Lock Code"+lockCode+"quantity::"+quantity+"holdQty::"+holdQty);
 								//Changed by Rohan on 06-08-13 if partial qty move from pso to pso lacation.start
@@ -825,7 +835,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 									System.out.println("-----Insert Block-----");
 									//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE
 									//insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,conn);
-									insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,locCodeFr,lotSl,quantity,lockCode,conn);
+									insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,locCodeFr,lotSl,quantity,lockCode,reasonCodeInvHold,conn);
 									System.out.println("@@@@ End of insertion...");
 								}
 								else
@@ -1035,7 +1045,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 	}
 	//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE
 	//private void insertIntoInvHold(String itemCode ,String siteCode, String locCode ,String lotNo, String lotSl, String tranIdHold ,Connection conn) throws ITMException
-	private void insertIntoInvHold(String itemCode ,String siteCode, String locCode ,String lotNo, String lotSl, String tranIdHold ,String locCodeFr,String lotSlFr,double holdQuantity,String lockCode,Connection conn) throws ITMException
+	//change done by kunal on 31/may/14 reason code add in argumnet
+	private void insertIntoInvHold(String itemCode ,String siteCode, String locCode ,String lotNo, String lotSl, String tranIdHold ,String locCodeFr,String lotSlFr,double holdQuantity,String lockCode,String reasonCode ,Connection conn) throws ITMException
 	{
 		PreparedStatement pstmtInsertInvHold =null;
 		PreparedStatement pstmtMaxLine =null;
@@ -1132,8 +1143,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 			else
 			{
 
-				String sqlInsertInvHold = "INSERT INTO INV_HOLD_DET (TRAN_ID, LINE_NO, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, HOLD_STATUS, STATUS_DATE , SCH_REL_DATE ) " +
-						" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+				String sqlInsertInvHold = "INSERT INTO INV_HOLD_DET (TRAN_ID, LINE_NO, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, HOLD_STATUS, STATUS_DATE , SCH_REL_DATE , REAS_CODE ) " +
+						" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
 				pstmtInsertInvHold = conn.prepareStatement(sqlInsertInvHold);
 
@@ -1147,6 +1158,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 				pstmtInsertInvHold.setString(8, "H");
 				pstmtInsertInvHold.setTimestamp(9, Timestamp.valueOf( sysDateStr));
 				pstmtInsertInvHold.setTimestamp(10, Timestamp.valueOf( sysDateStr));
+				pstmtInsertInvHold.setString(11, reasonCode);
 				int isInserted = pstmtInsertInvHold.executeUpdate();
 
 				System.out.println("@@@@ Hey Row inserted !!!!!!!! .....Total :["+isInserted+"]");
@@ -1172,7 +1184,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 					pstmt.close();
 					pstmt = null;
 				}
-
+			}
 				//sql = " UPDATE INV_HOLD_REL_TRACE SET HOLD_QTY = HOLD_QTY - ? WHERE  ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";
 				sql = " UPDATE INV_HOLD_REL_TRACE SET HOLD_QTY = HOLD_QTY - ? WHERE  ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?  AND LOCK_CODE = ?";
 				pstmt = conn.prepareStatement(sql);
@@ -1186,7 +1198,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 				pstmt.executeUpdate();
 				//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE.end
 
-			}
+			
 
 		} 
 		catch (Exception e)