Skip to content

B
business-java
Commit de6f8f4c authored by ssarkar's avatar ssarkar
Browse files
Options

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


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92717 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dbbfc068
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 19 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ de6f8f4c
...@@ -16768,7 +16768,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16768,7 +16768,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
//Changed by sumit on 11/12/12 suggesting active pick location start //Changed by sumit on 11/12/12 suggesting active pick location start
//return suggLocCode; //return suggLocCode;
if("A".equalsIgnoreCase(pickType.trim())) //Changed by sumit on 19/02/13 on adding condition for pickType "T"
//if("A".equalsIgnoreCase(pickType.trim()))
if("A".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()))
{ {
//Changed by sumit on 09/02/13 changing parameter as per method //Changed by sumit on 09/02/13 changing parameter as per method
//return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
...@@ -16825,7 +16827,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16825,7 +16827,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
//Changed by sumit on 11/12/12 suggesting active pick location start //Changed by sumit on 11/12/12 suggesting active pick location start
//return suggLocCode; //return suggLocCode;
if("A".equalsIgnoreCase(pickType.trim())) //Changed by sumit on 19/02/13 on adding condition for pickType "T"
//if("A".equalsIgnoreCase(pickType.trim()))
if("A".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()))
{ {
//Changed by sumit on 09/02/13 changing parameter as per method //Changed by sumit on 09/02/13 changing parameter as per method
//return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
...@@ -16842,7 +16846,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16842,7 +16846,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
//Changed by sumit on 11/12/12 suggesting active pick location start //Changed by sumit on 11/12/12 suggesting active pick location start
//return suggLocCode; //return suggLocCode;
if("A".equalsIgnoreCase(pickType.trim())) //Changed by sumit on 19/02/13 on adding condition for pickType "T"
//if("A".equalsIgnoreCase(pickType.trim()))
if("A".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()))
{ {
//Changed by sumit on 09/02/13 changing parameter as per method //Changed by sumit on 09/02/13 changing parameter as per method
//return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
...@@ -17181,7 +17187,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17181,7 +17187,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else else
{ {
if("A".equalsIgnoreCase(pickType.trim())) //Changed by sumit on 19/02/13 on adding condition for pickType "T"
//if("A".equalsIgnoreCase(pickType.trim()))
if("A".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()))
{ {
//Changed by sumit on 09/02/13 change as per method //Changed by sumit on 09/02/13 change as per method
//suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
...@@ -17232,7 +17240,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17232,7 +17240,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
else else
{ {
if("A".equalsIgnoreCase(pickType.trim())) //Changed by sumit on 19/02/13 on adding condition for pickType "T"
//if("A".equalsIgnoreCase(pickType.trim()))
if("A".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()))
{ {
//Changed by sumit on 09/02/13 change as per method //Changed by sumit on 09/02/13 change as per method
//suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
...@@ -17247,7 +17257,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17247,7 +17257,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
else else
{ {
if("A".equalsIgnoreCase(pickType.trim())) //Changed by sumit on 19/02/13 on adding condition for pickType "T"
//if("A".equalsIgnoreCase(pickType.trim()))
if("A".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()))
{ {
//Changed by sumit on 09/02/13 change as per method //Changed by sumit on 09/02/13 change as per method
//suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
...@@ -21664,11 +21676,12 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21664,11 +21676,12 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
isLocAvail = true; isLocAvail = true;
locCodeTo = rs.getString("LOC_CODE"); locCodeTo = rs.getString("LOC_CODE");
suggLocCode = locCodeTo; suggLocCode = locCodeTo;
temp.put("loc_code__to", locCodeTo); //Changed by sumit on 19/02/13 commenting not required
//temp.put("loc_code__to", locCodeTo);
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
System.out.println(" is SUMIT avail ["+isLocAvail+"]"); System.out.println(" isLocAvail ["+isLocAvail+"]");
//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)
{ {
...@@ -21696,8 +21709,9 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21696,8 +21709,9 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
System.out.println(" is 00000 avail ["+isLocAvail+"]"); System.out.println(" is 00000 avail ["+isLocAvail+"]");
}*/ }*/
if( !isLocAvail ) //Changed by sumit on 19/02/13 commenting if condition
{ /*if( !isLocAvail )
{*/
/*sql = "SELECT PD.LOC_CODE FROM PICK_ORD_DET PD, PICK_ORD_HDR PH WHERE " + /*sql = "SELECT PD.LOC_CODE FROM PICK_ORD_DET PD, PICK_ORD_HDR PH WHERE " +
" PH.PICK_ORDER = PD.PICK_ORDER AND PH.PICK_TYPE = ? " + " PH.PICK_ORDER = PD.PICK_ORDER AND PH.PICK_TYPE = ? " +
...@@ -21716,18 +21730,23 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21716,18 +21730,23 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
else else
{*/ {*/
//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;
if(pickSaleOrderDetail.size() > 0) if(pickSaleOrderDetail.size() > 0)
{ {
Set lotSlKey = pickSaleOrderDetail.keySet(); Set lotSlKey = pickSaleOrderDetail.keySet();
Iterator is = lotSlKey.iterator(); Iterator is = lotSlKey.iterator();
while(is.hasNext()) //Changed by sumit on 19/02/13 using below code here and changed while condition start.
//while(is.hasNext())
while(is.hasNext() && !isSame)
{ {
//Changed by sumit on 19/02/13 using below code here and changed while condition end.
String lo = (String)is.next(); String lo = (String)is.next();
System.out.println(" key is ["+lo+"]"); System.out.println(" key is ["+lo+"]");
ArrayList lotSLLIST = (ArrayList) pickSaleOrderDetail.get(lo); ArrayList lotSLLIST = (ArrayList) pickSaleOrderDetail.get(lo);
locCodeTo = ""; locCodeTo = "";
int temp1 = lotSLLIST.size(); int temp1 = lotSLLIST.size();
boolean isSame = false; //Changed by sumit on 19/02/13 commenting this and written in above
//boolean isSame = false;
for(int j = 0; j < temp1 ;j++) for(int j = 0; j < temp1 ;j++)
{ {
HashMap loadMap2 = (HashMap)lotSLLIST.get(j); HashMap loadMap2 = (HashMap)lotSLLIST.get(j);
...@@ -21738,11 +21757,19 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21738,11 +21757,19 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
break; break;
} }
} }
if(!isSame) //Changed by sumit on 19/02/13 commenting not required, written below start
/*if(!isSame)
{ {
temp.put("loc_code__to", suggLocCode); temp.put("loc_code__to", suggLocCode);
}*/
//Changed by sumit on 19/02/13 commenting not required, written below end
} }
//Changed by sumit on 19/02/13 written here above code start
if(!isSame)
{
temp.put("loc_code__to", suggLocCode);
} }
//Changed by sumit on 19/02/13 written here above code end
} }
else else
{ {
...@@ -21759,10 +21786,15 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21759,10 +21786,15 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
}*/ }*/
} //}
ArrayList tempList = new ArrayList(); ArrayList tempList = new ArrayList();
tempList.add(temp); tempList.add(temp);
//Changed by sumit on 13/02/13 adding condition to add list in map
//pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList);
if(!isSame)
{
pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList); pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList);
}
System.out.println(" populated pickSaleOrderDetail "+pickSaleOrderDetail); System.out.println(" populated pickSaleOrderDetail "+pickSaleOrderDetail);
if(pstmt != null) if(pstmt != null)
......
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