changed by sankara on 18/06/14 updated Replissconf and WaveCancelEJB

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

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

@@ -472,8 +472,9 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 						updateRowMap.put("tran_type","I"); 
 						updateRowMap.put("qty_stduom", ""+ actualQty);//360
 						updateRowMap.put("quantity", ""+actualQty);
-						noArt = Math.floor((actualQty) / shipperSize) ;
-						updateRowMap.put("no_art", noArt);
+					//changed by sankara on 18/06/14 for update no_art	
+					//	noArt = Math.floor((actualQty) / shipperSize) ;
+					//	updateRowMap.put("no_art", noArt);
 						updateRowMap.put("gross_weight", caseGrossWeight * noArt);
 						updateRowMap.put("net_weight", caseNetWeight * noArt);
 						updateRowMap.put("tare_weight", (caseGrossWeight - caseNetWeight) * noArt);

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

@@ -1036,7 +1036,10 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 					    		 //sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND REF_SER='P-PICK' AND CARTON_TYPE= 'P' ";
 					    		 sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND REF_SER IN ('P-PICK','A-PICK') AND CARTON_TYPE IN('P','A') AND TRACKING_NO IS NOT NULL";
 					    	 }*/
-				    		sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND MSN_NO > 0  AND TRACKING_NO IS NOT NULL";
+				    		
+				    		//changed by sankara on 18/06/14 consider carton master status 
+				    		//sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND MSN_NO > 0  AND TRACKING_NO IS NOT NULL";
+				    		sql = "SELECT MSN_NO, CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND MSN_NO > 0  AND TRACKING_NO IS NOT NULL AND STATUS <> 'R' ";
 							pstmt =  conn.prepareStatement(sql);	
 							pstmt.setString(1, ptcn);
 							rs = pstmt.executeQuery();