Skip to content

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

update by sumit on 09/02/13 active suggested location 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92669 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1c988b6f
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 22 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ daf7a1c5
...@@ -16626,7 +16626,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16626,7 +16626,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//return suggLocCode; //return suggLocCode;
if("A".equalsIgnoreCase(pickType.trim())) if("A".equalsIgnoreCase(pickType.trim()))
{ {
return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //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,siteCode, conn);
} }
else else
{ {
...@@ -16681,7 +16683,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16681,7 +16683,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//return suggLocCode; //return suggLocCode;
if("A".equalsIgnoreCase(pickType.trim())) if("A".equalsIgnoreCase(pickType.trim()))
{ {
return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //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,siteCode, conn);
} }
else else
{ {
...@@ -16696,7 +16700,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16696,7 +16700,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//return suggLocCode; //return suggLocCode;
if("A".equalsIgnoreCase(pickType.trim())) if("A".equalsIgnoreCase(pickType.trim()))
{ {
return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //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,siteCode, conn);
} }
else else
{ {
...@@ -17033,7 +17039,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17033,7 +17039,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("A".equalsIgnoreCase(pickType.trim())) if("A".equalsIgnoreCase(pickType.trim()))
{ {
suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //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,siteCode, conn);
suggestedLocList.add(suggLocCode) ; suggestedLocList.add(suggLocCode) ;
} }
else else
...@@ -17082,7 +17090,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17082,7 +17090,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
if("A".equalsIgnoreCase(pickType.trim())) if("A".equalsIgnoreCase(pickType.trim()))
{ {
suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //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,siteCode, conn);
suggestedLocList.add(suggLocCode) ; suggestedLocList.add(suggLocCode) ;
} }
else else
...@@ -17095,7 +17105,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17095,7 +17105,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
if("A".equalsIgnoreCase(pickType.trim())) if("A".equalsIgnoreCase(pickType.trim()))
{ {
suggLocCode = getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn); //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,siteCode, conn);
suggestedLocList.add(suggLocCode) ; suggestedLocList.add(suggLocCode) ;
} }
else else
...@@ -21429,7 +21441,8 @@ private String generatedLabelPrint(String waveId, String printer, Connection con ...@@ -21429,7 +21441,8 @@ private String generatedLabelPrint(String waveId, String printer, Connection con
} }
//Chnged by sumit on 24/11/12 to get label print end. //Chnged by sumit on 24/11/12 to get label print end.
//Changed by sumit on 10/12/12 suggesting active location for same item code and lot No. start. //Changed by sumit on 10/12/12 suggesting active location for same item code and lot No. start.
private String getPickLocForSameItemLotNo(String invStat, String pickType, String itemCode, String lotNo, String lotSl, String suggLocCode, Connection conn) throws ITMException //Changed by sumit on 09/02/13 adding site code method parameter
private String getPickLocForSameItemLotNo(String invStat, String pickType, String itemCode, String lotNo, String lotSl, String suggLocCode, String siteCode, Connection conn) throws ITMException
{ {
String itemCodeTemp = ""; String itemCodeTemp = "";
...@@ -21437,6 +21450,9 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21437,6 +21450,9 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
String lotSlTemp = ""; String lotSlTemp = "";
String locCodeTo = ""; String locCodeTo = "";
String saleOrder = ""; String saleOrder = "";
String sql2 = "";// added by sumit on 08/02/13
boolean isLocAvail = false;// added by sumit on 08/02/13
double quantity = 0.0;
PreparedStatement pstmt = null, pstmt1 = null; PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null; ResultSet rs = null, rs1 = null;
...@@ -21462,21 +21478,55 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21462,21 +21478,55 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
Map temp = new HashMap(); Map temp = new HashMap();
temp.put("item_code", itemCodeTemp); temp.put("item_code", itemCodeTemp);
temp.put("lot_no", lotNoTemp); temp.put("lot_no", lotNoTemp);
//Changed by sumit on 08/02/13 adding site code in sql
sql = "SELECT LOC_CODE FROM STOCK WHERE ITEM_CODE = ? AND INV_STAT = ? AND LOT_NO = ? "; //sql = "SELECT LOC_CODE FROM STOCK WHERE ITEM_CODE = ? AND INV_STAT = ? AND LOT_NO = ? ";
sql = "SELECT S.LOC_CODE FROM STOCK S, LOCATION L WHERE S.LOC_CODE = L.LOC_CODE AND S.ITEM_CODE = ? " +
" AND S.SITE_CODE = ? AND L.INV_STAT = ? AND S.LOT_NO = ? AND S.QUANTITY > 0 ";
pstmt= conn.prepareStatement(sql); pstmt= conn.prepareStatement(sql);
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
pstmt.setString(2,invStat); //Changed by sumit on 08/02/13
pstmt.setString(3, lotNo); pstmt.setString(2, siteCode);
pstmt.setString(3,invStat);
pstmt.setString(4, lotNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
isLocAvail = true;
locCodeTo = rs.getString("LOC_CODE"); locCodeTo = rs.getString("LOC_CODE");
suggLocCode = locCodeTo; suggLocCode = locCodeTo;
temp.put("loc_code__to", locCodeTo); temp.put("loc_code__to", locCodeTo);
} }
else rs.close(); rs = null;
pstmt.close(); pstmt = null;
//Changed by sumit on 08/02/13 checking zero stock stock start.
if( !isLocAvail)
{
/*sql = "SELECT LOC_CODE FROM STOCK WHERE ITEM_CODE = ? AND INV_STAT = ? AND LOT_NO = ? AND SITE_CODE = ? AND QUANTITY = 0 ";
pstmt= conn.prepareStatement(sql);*/
sql2 = "SELECT SUM(QUANTITY) FROM STOCK WHERE SITE_CODE = ? " +
" AND LOC_CODE = ? ";
pstmt1= conn.prepareStatement(sql2);
pstmt1.setString(1,siteCode);
pstmt1.setString(2, suggLocCode);
rs1 = pstmt1.executeQuery();
if( rs1.next())
{
quantity = rs1.getDouble(1);
}
rs1.close(); rs1 = null;
pstmt1.close(); pstmt1 = null;
if( quantity ==0 )
{ {
isLocAvail = true;
locCodeTo = suggLocCode;
temp.put("loc_code__to", suggLocCode);
}
}
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 = ? " +
" AND PD.ITEM_CODE = ? AND PD.LOT_NO = ?"; " AND PD.ITEM_CODE = ? AND PD.LOT_NO = ?";
...@@ -21557,12 +21607,12 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21557,12 +21607,12 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
} }
if(pickSaleOrderDetail.size() == 1) /*if(pickSaleOrderDetail.size() == 1)
{ {
return suggLocCode; return suggLocCode;
} }
else else
{ {*/
Set lotSlKey = pickSaleOrderDetail.keySet(); Set lotSlKey = pickSaleOrderDetail.keySet();
Iterator is = lotSlKey.iterator(); Iterator is = lotSlKey.iterator();
while(is.hasNext()) while(is.hasNext())
...@@ -21585,11 +21635,11 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21585,11 +21635,11 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
} }
} }
if( locCodeTo.length() == 0) /*if( locCodeTo.length() == 0)
{ {
return locCodeTo = suggLocCode; return locCodeTo = suggLocCode;
} }*/
} //}
} }
......
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