Commit 9a4c6d45 authored by jshinde's avatar jshinde

Updated for rejected locations


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101448 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c4696584
......@@ -146,7 +146,14 @@ implements PalletReqExpiryActLocal, PalletReqExpiryActRemote
"AND D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND S.INV_STAT= ? AND S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1) AND " +
"A.ITEM_CODE=S.ITEM_CODE AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND " +
" FN_CHK_PR(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1),?) = 0 AND S.QUANTITY>0 AND S.NO_ART >0 AND S.QTY_PER_ART >0 AND SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1) IS NOT NULL AND N.INV_STAT = S.INV_STAT ";
" FN_CHK_PR(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1),?) = 0 AND S.QUANTITY>0 AND S.NO_ART >0 AND S.QTY_PER_ART >0 AND SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1) IS NOT NULL AND N.INV_STAT = S.INV_STAT UNION ALL " +
" SELECT SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1) ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, S.NO_ART ,S.LOC_CODE AS ACTUAL_PALLET ,L.DESCR ,N.DESCR AS INVSTAT_DECSR " +
" FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A ,INVSTAT N WHERE S.ITEM_CODE = D.ITEM_CODE " +
" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE " +
"AND D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND S.INV_STAT= ? AND S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1) AND " +
"A.ITEM_CODE=S.ITEM_CODE AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND " +
" FN_CHK_PR(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1),?) = 0 AND S.QUANTITY>0 AND S.NO_ART >0 AND S.QTY_PER_ART >0 AND SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1) IS NOT NULL AND N.INV_STAT = S.INV_STAT ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "R");
......@@ -208,6 +215,13 @@ implements PalletReqExpiryActLocal, PalletReqExpiryActRemote
pstmt.setString(57, "S");
pstmt.setString(58, "P");
pstmt.setString(59, tranId);
pstmt.setString(60, "R");
pstmt.setString(61, "EXP_LOCK");
pstmt.setString(62, "AWMSQ");
pstmt.setString(63, siteCode);
pstmt.setString(64, "S");
pstmt.setString(65, "P");
pstmt.setString(66, tranId);
rs = pstmt.executeQuery();
while (rs.next())
......@@ -338,7 +352,14 @@ implements PalletReqExpiryActLocal, PalletReqExpiryActRemote
"AND D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND S.INV_STAT= ? AND S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1) AND " +
"A.ITEM_CODE=S.ITEM_CODE AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND " +
" FN_CHK_PR(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1),?) = 0 AND S.QUANTITY>0 AND S.NO_ART >0 AND S.QTY_PER_ART >0 AND SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1) IS NOT NULL AND N.INV_STAT = S.INV_STAT ";
" FN_CHK_PR(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1),?) = 0 AND S.QUANTITY>0 AND S.NO_ART >0 AND S.QTY_PER_ART >0 AND SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'S')-1) IS NOT NULL AND N.INV_STAT = S.INV_STAT UNION ALL " +
" SELECT SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1) ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, S.NO_ART ,S.LOC_CODE AS ACTUAL_PALLET ,L.DESCR ,N.DESCR AS INVSTAT_DECSR " +
" FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A ,INVSTAT N WHERE S.ITEM_CODE = D.ITEM_CODE " +
" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE " +
"AND D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND S.INV_STAT= ? AND S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1) AND " +
"A.ITEM_CODE=S.ITEM_CODE AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND " +
" FN_CHK_PR(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1),?) = 0 AND S.QUANTITY>0 AND S.NO_ART >0 AND S.QTY_PER_ART >0 AND SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'R')-1) IS NOT NULL AND N.INV_STAT = S.INV_STAT ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "R");
......@@ -400,6 +421,13 @@ implements PalletReqExpiryActLocal, PalletReqExpiryActRemote
pstmt.setString(57, "S");
pstmt.setString(58, "P");
pstmt.setString(59, tranId);
pstmt.setString(60, "R");
pstmt.setString(61, "EXP_LOCK");
pstmt.setString(62, "AWMSQ");
pstmt.setString(63, siteCode);
pstmt.setString(64, "S");
pstmt.setString(65, "P");
pstmt.setString(66, tranId);
rs = pstmt.executeQuery();
while (rs.next())
......
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