Commit 6f3fe587 authored by ppatro's avatar ppatro

added order type "P" for pso to active replenishment


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92293 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4bc4302b
...@@ -370,7 +370,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -370,7 +370,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//Changed By Pragyan //Changed By Pragyan
//if ( "active_repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("A") && ! orderType.trim().equalsIgnoreCase("E")) //if ( "active_repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("A") && ! orderType.trim().equalsIgnoreCase("E"))
System.out.println("objName****"+objName+"orderType***"+orderType); System.out.println("objName****"+objName+"orderType***"+orderType);
if ( "active_repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("A") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("Q") && ! orderType.trim().equalsIgnoreCase("T") && ! orderType.trim().equalsIgnoreCase("I")) if ( "active_repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("A") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("Q") && ! orderType.trim().equalsIgnoreCase("T") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("P"))
{ {
/*errList.add( "ACTIVEPICK" ); /*errList.add( "ACTIVEPICK" );
...@@ -2936,14 +2936,14 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -2936,14 +2936,14 @@ 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" + " 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" + " WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND" +
" R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE NOT IN ('E','Q') " + " 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"; " 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)) 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," + 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 R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE IN ('E','Q','T') " + " 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 "; " 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 ";
} }
System.out.println("CURRENT SQL["+sql+"]"); System.out.println("CURRENT SQL["+sql+"]");
...@@ -3127,11 +3127,16 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3127,11 +3127,16 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
USER_DEFINED_VALUE_MAP.put(loginCode, invPndReserve); USER_DEFINED_VALUE_MAP.put(loginCode, invPndReserve);
System.out.println("USER_DEFINED_VALUE_MAP----set 2loginCode["+loginCode+"]invDeepReserve"+invDeepReserve); System.out.println("USER_DEFINED_VALUE_MAP----set 2loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
} }
else if("D".equalsIgnoreCase(orderType) || "C".equalsIgnoreCase(orderType) || "M".equalsIgnoreCase(orderType) || "Q".equalsIgnoreCase(orderType)) else if("D".equalsIgnoreCase(orderType) || "C".equalsIgnoreCase(orderType) || "M".equalsIgnoreCase(orderType) || "P".equalsIgnoreCase(orderType))
{ {
USER_DEFINED_VALUE_MAP.put(loginCode, invReserve); USER_DEFINED_VALUE_MAP.put(loginCode, invReserve);
System.out.println("USER_DEFINED_VALUE_MAP----set 3loginCode["+loginCode+"]invDeepReserve"+invDeepReserve); System.out.println("USER_DEFINED_VALUE_MAP----set 3loginCode["+loginCode+"]invDeepReserve"+invReserve);
} }
else if("Q".equalsIgnoreCase(orderType))
{
USER_DEFINED_VALUE_MAP.put(loginCode, casePickInv);
System.out.println("USER_DEFINED_VALUE_MAP----set 3loginCode["+loginCode+"]invDeepReserve"+casePickInv);
}
else if("T".equalsIgnoreCase(orderType)) else if("T".equalsIgnoreCase(orderType))
{ {
USER_DEFINED_VALUE_MAP.put(loginCode, partialResrvLoc); USER_DEFINED_VALUE_MAP.put(loginCode, partialResrvLoc);
......
...@@ -13412,7 +13412,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -13412,7 +13412,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"RR-DSA","E",ptcn,conn); replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"RR-DSA","E",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId); pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q"); //pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.setString(9,"P");
pstmtRplHdr.executeUpdate(); pstmtRplHdr.executeUpdate();
isReplHdrPSO = true; isReplHdrPSO = true;
replOrdPSOCpy = replRefDeepId; replOrdPSOCpy = replRefDeepId;
...@@ -13949,7 +13950,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -13949,7 +13950,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"RR-DSA","E",ptcn,conn); replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"RR-DSA","E",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId); pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q"); //pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.setString(9,"P");
pstmtRplHdr.executeUpdate(); pstmtRplHdr.executeUpdate();
isReplHdrPSO = true; isReplHdrPSO = true;
replOrdPSOCpy = replRefDeepId; replOrdPSOCpy = replRefDeepId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment