Chnaged by Rohan on 25-10-12

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

webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java

@@ -1027,7 +1027,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 	    String lineNoPk = "";
 	    String replOrdList = "";
 		String replLineNoList = "";
-		
+		String invS = "";
+		String replOrdChk = "";
+		String replLineChk = "";
 	    DistCommon discommon = new DistCommon();
 	    String casePickLoc  = discommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
 	    String activePickLoc  = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
@@ -1072,7 +1074,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 							{
 								System.out.println("Order TYpe Q check"+orderType);
 								//to reverse actual_qty in case repanishment
-								getActualQty ="SELECT ACTUAL_QTY FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?" ;
+								//getActualQty ="SELECT ACTUAL_QTY FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?" ;
+								replOrdChk = "";
+								replLineChk = "";
+								
+								getActualQty ="SELECT D.ACTUAL_QTY,L.INV_STAT,D.PICK_ORDER,D.LINE_NO__PICK FROM REPL_ORD_DET D,LOCATION L "
+								              +" WHERE REPL_ORDER = ? AND LINE_NO = ? "
+								              + " AND L.LOC_CODE = D.LOC_CODE ";
 								pstmt1 =  conn.prepareStatement(getActualQty);	
 								pstmt1.setString(1, replOrder);
 								pstmt1.setString(2, lineNo);
@@ -1080,6 +1088,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 								if(rs1.next())
 								{
 									actQty = rs1.getDouble("ACTUAL_QTY");
+									invS =  rs1.getString("INV_STAT");
+									replOrdChk = rs1.getString("PICK_ORDER");
+									replLineChk = rs1.getString("LINE_NO__PICK");
 								}
 								if(rs1 != null)
 								{
@@ -1092,7 +1103,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 									pstmt1 = null;
 								}
 								
-								
+								System.out.println("1 check invS"+invS+"replOrdChk"+replOrdChk+"replLineChk"+replLineChk);
 								replOrd = checkNull(rs.getString("PICK_ORDER"));
 								lineNoRepl = rs.getString("LINE_NO__PICK");
 								
@@ -1100,6 +1111,36 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 								{	
 									System.out.println("REPL ORDER"+replOrd);
 									
+									if(invS.trim().equalsIgnoreCase(casePickLoc.trim()))
+									{
+										sqlOrderType = "SELECT D.PICK_ORDER,D.LINE_NO__PICK,L.INV_STAT FROM REPL_ORD_DET D,LOCATION L " 
+											 +" WHERE REPL_ORDER = ? AND LINE_NO = ? "
+											 +" AND L.LOC_CODE = D.LOC_CODE ";
+										pstmt1 =  conn.prepareStatement(sqlOrderType);	
+										pstmt1.setString(1, replOrdChk);
+										pstmt1.setString(2, replLineChk);
+										rs1 = pstmt1.executeQuery();
+										if(rs1.next())
+										{
+											
+											invS =  rs1.getString("INV_STAT");
+											replOrdChk = checkNull(rs1.getString("PICK_ORDER"));
+											replLineChk = checkNull(rs1.getString("LINE_NO__PICK"));
+										}
+										if(rs1 != null)
+										{
+											rs1.close();
+											rs1 = null;
+										}
+										if(pstmt1 != null)
+										{
+											pstmt1.close();
+											pstmt1 = null;
+										}
+										System.out.println("2 check invS"+invS+"replOrdChk"+replOrdChk+"replLineChk"+replLineChk);
+									}
+									//Changed by rohan start
+									/*
 									sqlOrderType = "SELECT ORDER_TYPE FROM REPL_ORD_HDR WHERE REPL_ORDER = ? ";
 									pstmt1 =  conn.prepareStatement(sqlOrderType);	
 									pstmt1.setString(1, replOrd);
@@ -1119,7 +1160,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 										pstmt1.close();
 										pstmt1 = null;
 									}
-									
+									*/
+									////Chnaged by Rohan end
+									/*
 									if("J".equalsIgnoreCase(ordType))
 									{	
 										updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
@@ -1133,11 +1176,33 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 												   +" WHERE REPL_ORDER = ? AND LINE_NO = ? ";
 										
 									}
+									*/
+									System.out.println("3 check invS"+invS);
+									if(invS.trim().equalsIgnoreCase(psoLoc.trim()))
+									{
+										updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
+												   +" WHERE REPL_ORDER = ? AND LINE_NO = ? ";
+									}
+									else
+									{
+										updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
+												  +" WHERE (REPL_ORDER,LINE_NO) IN(SELECT PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET"
+												   +" WHERE REPL_ORDER = ? AND LINE_NO = ?)";
+									}
 									pstmt1 =  conn.prepareStatement(updateSql);
 									pstmt1.setDouble(1, actQty);
-									pstmt1.setString(2, replOrd);
-									pstmt1.setString(3, lineNoRepl);
-									
+									if("".equalsIgnoreCase(replOrdChk) && invS.trim().equalsIgnoreCase(casePickLoc.trim()))
+									{
+										System.out.println("**************"+"replOrdChk"+replOrdChk+"replLineChk"+replLineChk);
+										pstmt1.setString(2, replOrdChk);
+										pstmt1.setString(3, replLineChk);
+									}
+									else
+									{	
+										System.out.println("########################"+"replOrd"+replOrd+"replLineChk"+lineNoRepl);
+										pstmt1.setString(2, replOrd);
+										pstmt1.setString(3, lineNoRepl);
+									}	
 									pstmt1.executeUpdate();
 									if(pstmt1 != null)
 									{