Commit d1962df1 authored by ssarkar's avatar ssarkar

update by sumit on 07/03/12 bug solved for active suggestion


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92816 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2cb17289
...@@ -21705,7 +21705,9 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21705,7 +21705,9 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
for(int i =0;i<itemMapListLen;i++) for(int i =0;i<itemMapListLen;i++)
{ {
HashMap loadMap = (HashMap)itemMapList.get(i); HashMap loadMap = (HashMap)itemMapList.get(i);
if(itemCode.equalsIgnoreCase(loadMap.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap.get("lot_no").toString())) //Changed by sumit on 07/03/13 adding condition.
//if(itemCode.equalsIgnoreCase(loadMap.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap.get("lot_no").toString()))
if(itemCode.equalsIgnoreCase(loadMap.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap.get("lot_no").toString()) && !isLocAvail)
{ {
itemCodeTemp = (String)loadMap.get("item_code"); itemCodeTemp = (String)loadMap.get("item_code");
lotNoTemp = (String)loadMap.get("lot_no"); lotNoTemp = (String)loadMap.get("lot_no");
...@@ -21735,6 +21737,31 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21735,6 +21737,31 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
System.out.println(" isLocAvail ["+isLocAvail+"]"); System.out.println(" isLocAvail ["+isLocAvail+"]");
//Changed by sumit on 06/03/13 checking whether repl pending for active suggetion start
if( !isLocAvail)
{
sql = " SELECT ROD.REPL_ORDER, ROD.LOC_CODE__TO FROM REPL_ORD_DET ROD, WAVE_TASK_DET WTD, WAVE_TASK WT, LOCATION L " +
" WHERE ROD.ITEM_CODE = ? AND ROD.LOT_NO = ? AND ROD.LOC_CODE__TO = L.LOC_CODE AND L.INV_STAT = ? AND WTD.WAVE_ID = WT.WAVE_ID " +
" AND WTD.REF_ID = ROD.REPL_ORDER AND CASE WHEN ROD.CANCEL_MODE IS NULL THEN 'N' ELSE ROD.CANCEL_MODE END <> 'Y' " +
" AND ROD.SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCodeTemp);
pstmt.setString(2, lotNoTemp);
pstmt.setString(3, invStat);
pstmt.setString(4, siteCode);
rs = pstmt.executeQuery();
if( rs.next())
{
isLocAvail = true;
locCodeTo = rs.getString("LOC_CODE__TO");
suggLocCode = locCodeTo;
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
//Changed by sumit on 06/03/13 checking whether repl pending for active suggetion end
//Changed by sumit on 08/02/13 checking zero stock stock start. //Changed by sumit on 08/02/13 checking zero stock stock start.
/*if( !isLocAvail) /*if( !isLocAvail)
{ {
...@@ -21784,7 +21811,7 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21784,7 +21811,7 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
{*/ {*/
//loop for already suggested location for same item and lot no. //loop for already suggested location for same item and lot no.
boolean isSame = false; boolean isSame = false;
if(pickSaleOrderDetail.size() > 0) if(pickSaleOrderDetail.size() > 0 && !isLocAvail)
{ {
Set lotSlKey = pickSaleOrderDetail.keySet(); Set lotSlKey = pickSaleOrderDetail.keySet();
Iterator is = lotSlKey.iterator(); Iterator is = lotSlKey.iterator();
...@@ -21805,6 +21832,8 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21805,6 +21832,8 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
HashMap loadMap2 = (HashMap)lotSLLIST.get(j); HashMap loadMap2 = (HashMap)lotSLLIST.get(j);
if(itemCode.equalsIgnoreCase(loadMap2.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap2.get("lot_no").toString())) if(itemCode.equalsIgnoreCase(loadMap2.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap2.get("lot_no").toString()))
{ {
//Changed by sumit on 07/03/13 for identify loc found
isLocAvail = true;
isSame = true; isSame = true;
temp.put("loc_code__to", loadMap2.get("loc_code__to").toString()); temp.put("loc_code__to", loadMap2.get("loc_code__to").toString());
break; break;
...@@ -21820,12 +21849,16 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21820,12 +21849,16 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
//Changed by sumit on 19/02/13 written here above code start //Changed by sumit on 19/02/13 written here above code start
if(!isSame) if(!isSame)
{ {
//Changed by sumit on 07/03/13 for identify loc found
isLocAvail = true;
temp.put("loc_code__to", suggLocCode); temp.put("loc_code__to", suggLocCode);
} }
//Changed by sumit on 19/02/13 written here above code end //Changed by sumit on 19/02/13 written here above code end
} }
else else
{ {
//Changed by sumit on 07/03/13 for identify loc found
isLocAvail = true;
temp.put("loc_code__to", suggLocCode); temp.put("loc_code__to", suggLocCode);
} }
/*} /*}
...@@ -21844,7 +21877,7 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21844,7 +21877,7 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
tempList.add(temp); tempList.add(temp);
//Changed by sumit on 13/02/13 adding condition to add list in map //Changed by sumit on 13/02/13 adding condition to add list in map
//pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList); //pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList);
if(!isSame) if(!isSame && isLocAvail)
{ {
pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList); pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList);
} }
......
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