To merge src for WMS updated wave gen changes.

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

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

@@ -12739,7 +12739,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 													
 													pstmtDet.executeUpdate();
 													
-													updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc,(packSizeCase - quantityToUpd),replRefDeepId,String.valueOf(replCnt-1), conn);
+													updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc,(packSizeCase - quantityToUpd),replRefDeepId,String.valueOf(refCtr), conn);
 													itemVolumeTotal = itemVolumeTotal + quantityToUpd*itemVolume;
 													itemWeightTotal = itemWeightTotal +  quantityToUpd*itemWeight;
 													//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
@@ -19415,7 +19415,8 @@ public int updateReplOrdDet(String replType,String itemCode,String siteCode,Stri
 	try
 	{
 		sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ?,REPL_TYPE = ? WHERE ITEM_CODE = ?" +
-				" AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND REPL_ORDER = ?" ;
+				//" AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND REPL_ORDER = ?" ;
+				" AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?" ;
 				//"AND LOC_CODE__TO = ?";
 		
 		
@@ -19428,6 +19429,7 @@ public int updateReplOrdDet(String replType,String itemCode,String siteCode,Stri
 		pstmt.setString(6, lotNo);
 		pstmt.setString(7, lotSl);
 		pstmt.setString(8, replOrder);
+		pstmt.setInt(9, Integer.parseInt(replLineNo));
 		updatedRecordCount = pstmt.executeUpdate();
 				
     }