CHECK THE CANCEL FLAG FOR REPLENISHMENT

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

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

@@ -3028,16 +3028,20 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						{
 						
 							
-							sql = " SELECT REPL_ORDER,LOC_CODE FROM (SELECT  DISTINCT R.REPL_ORDER ,L.LOC_CODE" +
+							sql =" SELECT REPL_ORDER,LOC_CODE FROM (SELECT  DISTINCT R.REPL_ORDER ,L.LOC_CODE" +
 								 " FROM REPL_ORD_DET R,REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L,WAVE_TASK WH" +
 								 " WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND" +
+								 //Changed By Pragyan 01/03/13 To check the repl order cancel flag
+								 " CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND " +
 								 " R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE NOT IN ('E','Q','T','P','I') " +
 								 " AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE";
 						}
 						else if("active_repl_iss".equalsIgnoreCase(objNameChk))
 						{
 							sql = " SELECT REPL_ORDER,LOC_CODE FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE FROM REPL_ORD_DET R,REPL_ORD_HDR H," +
-								  " WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER " +
+								  " WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND " +
+								  //Changed By Pragyan 01/03/13 To check the repl order cancel flag
+								  " CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND " +
 								  " AND R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE IN ('E','Q','T','P','I') " +
 								  " AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE ";
 						}

webitm-wms/module-resource/sql/update.sql

@@ -31340,7 +31340,7 @@ INSERT INTO OBJ_ITEMCHANGE (
 	NULL,
 	NULL);
 	
-	INSERT INTO MESSAGES (
+INSERT INTO MESSAGES (
         msg_no ,
         msg_str ,
         msg_descr ,
@@ -31368,6 +31368,36 @@ INSERT INTO OBJ_ITEMCHANGE (
         'BASE           ',
         NULL,
         NULL);
+        
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'NVLPLTMND',
+        'Blank Pallet No',
+        'Pallet No is Mandatory In case of Direct Pick Location Selected in Wave',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE      ',
+        'Pragyan',
+        NULL,
+        NULL);
+	
 	
        		
 commit;