update sql in updatePalletNo

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

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

@@ -11961,6 +11961,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 									 {
 										 tempCaseReplList = getActiveCaseReplMap("X",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
 									 }
+									 //Changes by Dadaso pawar on 11/02/15 [Start] Resolved Multiple active Repl. from same case pick location.  
+									 if(tempReplList.size() == 0 && tempCaseReplList.size() == 0)
+									 {
+										 tempReplList = getActiveCaseReplMap("Q",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
+									 }
+									 //Changes by Dadaso pawar on 11/02/15 [End] Resolved Multiple active Repl. from same case pick location.
 								}					
 								if(tempReplList.size() > 0)
 								{
@@ -23392,7 +23398,10 @@ private void updatePalletNo(String PTCN,String palletNo , Connection conn) throw
 	 try
 	 {
 		 //System.out.println(" -- saleOrder ["+saleOrder+"] lineNo ["+lineNo+"] itemCode ["+itemCode+"] ");
-		 sql =   "UPDATE CARTON_MASTER SET PALLET_NO = ? WHERE PTCN = ? AND CARTON_TYPE IN ('A','M')";
+		 //Changes by Dadaso pawar on 11/02/15 [Start] For direct pick location pallet No. Should be updated for each case.
+		// sql =   "UPDATE CARTON_MASTER SET PALLET_NO = ? WHERE PTCN = ? AND CARTON_TYPE IN ('A','M')";
+		  sql =   "UPDATE CARTON_MASTER SET PALLET_NO = ? WHERE PTCN = ? AND CARTON_TYPE IN ('A','C')";
+		  //Changes by Dadaso pawar on 11/02/15 [End] For direct pick location pallet No. Should be updated for each case.
 		 sql1 =   "UPDATE PALLET_NO SET STATUS = ? WHERE PALLET_NO = ?";
 		 pstmt = conn.prepareStatement(sql);
 		 pstmt.setString(1, palletNo);