Skip to content

B
business-java
Commit 6f24a159 authored by kmandhre's avatar kmandhre
Browse files
Options

change the key of item map for display stock qty 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94054 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 99b099df
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 14 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAllocationPrc.java
View file @ 6f24a159
...@@ -439,6 +439,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -439,6 +439,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
pstmt2 = null; pstmt2 = null;
//added by ritesh 0n 7/8/13 for request DI3ESUN009 END //added by ritesh 0n 7/8/13 for request DI3ESUN009 END
/* comment by kunal on 24/dec/13
if(itemCodeMap.containsKey(rs.getString(6)) ) if(itemCodeMap.containsKey(rs.getString(6)) )
{ {
balStockQty = Double.parseDouble(itemCodeMap.get(rs.getString(6)).toString()); balStockQty = Double.parseDouble(itemCodeMap.get(rs.getString(6)).toString());
...@@ -446,7 +447,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -446,7 +447,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
} }
else else
{ {*/
if(checkLocation) if(checkLocation)
{ {
...@@ -600,13 +601,17 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -600,13 +601,17 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
holdQty = rs1.getDouble(2); //added by Kunal on 22/10/12 holdQty = rs1.getDouble(2); //added by Kunal on 22/10/12
if (balStockQty > 0) if (balStockQty > 0)
{ {
itemCodeMap.put(rs.getString(6),new Double(rs1.getDouble(1))); //itemCodeMap.put(rs.getString(6),new Double(rs1.getDouble(1)));
//change done by kunal change key of itemmap on 24/dec/13
itemCodeMap.put((rs.getString(6).trim()+"@"+rs.getString(12).trim()),new Double(rs1.getDouble(1)));
} }
else else
{ {
if ("A".equalsIgnoreCase(disOpt))// To display all records, added by Kunal on 18/NOV/13 if ("A".equalsIgnoreCase(disOpt))// To display all records, added by Kunal on 18/NOV/13
{ {
itemCodeMap.put(rs.getString(6),new Double(rs1.getDouble(1))); //itemCodeMap.put(rs.getString(6),new Double(rs1.getDouble(1)));
//change done by kunal change key of itemmap\
itemCodeMap.put((rs.getString(6).trim()+"@"+rs.getString(12).trim()),new Double(rs1.getDouble(1)));
} }
} }
System.out.println("Bal stk qty for item ....." + rs.getString(6) + " is " + balStockQty+" hold qty="+holdQty); System.out.println("Bal stk qty for item ....." + rs.getString(6) + " is " + balStockQty+" hold qty="+holdQty);
...@@ -615,10 +620,12 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -615,10 +620,12 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
rs1 = null; rs1 = null;
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
} //}
//if (balStockQty > 0) //if (balStockQty > 0)
if(itemCodeMap.containsKey(rs.getString(6)) ) System.out.println("kunal test map::"+itemCodeMap.toString());
System.out.println("kunal test::"+itemCodeMap.containsKey((rs.getString(6).trim()+"@"+rs.getString(12).trim())));
if(itemCodeMap.containsKey((rs.getString(6).trim()+"@"+rs.getString(12).trim())) )//change the key of itemmap
{ {
retTabSepStrBuff.append("<Detail2>"); retTabSepStrBuff.append("<Detail2>");
...@@ -775,7 +782,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -775,7 +782,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
// this line has to be commented later // this line has to be commented later
// as this will be a input from the user // as this will be a input from the user
itemCodeMap.put(rs.getString(6), new Double(balStockQty)); itemCodeMap.put((rs.getString(6).trim()+"@"+rs.getString(12).trim()), new Double(balStockQty));
//PACK_INSTR //PACK_INSTR
//retTabSepStrBuff.append(rs.getString(11) == null? " ":rs.getString(11)).append("\t"); //retTabSepStrBuff.append(rs.getString(11) == null? " ":rs.getString(11)).append("\t");
retTabSepStrBuff.append("<pack_instr>").append("<![CDATA[" + (rs.getString(11) == null? " ":rs.getString(11)) +"]]>").append("</pack_instr>"); retTabSepStrBuff.append("<pack_instr>").append("<![CDATA[" + (rs.getString(11) == null? " ":rs.getString(11)) +"]]>").append("</pack_instr>");
...@@ -1390,6 +1397,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1390,6 +1397,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
String itemRef = null; String itemRef = null;
String status =null; String status =null;
String resrvLoc = "",casePickLoc = "",activePickLoc = "" ,deepStoreLoc = "" ,partialResrvLoc = "";//added by kunal on 14/NOV/13 String resrvLoc = "",casePickLoc = "",activePickLoc = "" ,deepStoreLoc = "" ,partialResrvLoc = "";//added by kunal on 14/NOV/13
String siteCodeShip = "";//added by kunal on 23/DEC/13
java.sql.Date expDate = new java.sql.Date(System.currentTimeMillis()); java.sql.Date expDate = new java.sql.Date(System.currentTimeMillis());
java.sql.Date mfgDate = new java.sql.Date(System.currentTimeMillis()); java.sql.Date mfgDate = new java.sql.Date(System.currentTimeMillis());
java.sql.Date dateAlloc= new java.sql.Date(System.currentTimeMillis()); java.sql.Date dateAlloc= new java.sql.Date(System.currentTimeMillis());
...@@ -1439,10 +1447,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1439,10 +1447,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
rs = pstmtStock.executeQuery(); rs = pstmtStock.executeQuery();
System.out.println("siteCode------"+ siteCode); System.out.println("siteCodeShip------"+ siteCodeShip);
if(rs.next()) if(rs.next())
{ {
siteCode = rs.getString(1); siteCodeShip = rs.getString(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -1450,7 +1458,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1450,7 +1458,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
pstmtStock = null; pstmtStock = null;
// end 21/08/12 manoharan get the shipping site // end 21/08/12 manoharan get the shipping site
System.out.println("siteCode------"+ siteCode); System.out.println("siteCodeShip------"+ siteCodeShip);
sorditemSql = "SELECT ITEM_CODE,ITEM_CODE__ORD,UNIT, QTY_DESP, ITEM_REF," sorditemSql = "SELECT ITEM_CODE,ITEM_CODE__ORD,UNIT, QTY_DESP, ITEM_REF,"
+" QUANTITY - QTY_DESP PENDING_QUANTITY,MIN_SHELF_LIFE " +" QUANTITY - QTY_DESP PENDING_QUANTITY,MIN_SHELF_LIFE "
+" FROM SORDITEM WHERE SALE_ORDER = '" + saleOrder + "' " +" FROM SORDITEM WHERE SALE_ORDER = '" + saleOrder + "' "
...@@ -1610,7 +1618,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1610,7 +1618,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
getDataSql=getDataSql+" ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE "; getDataSql=getDataSql+" ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
pstmtStock = conn.prepareStatement(getDataSql); pstmtStock = conn.prepareStatement(getDataSql);
pstmtStock.setString(1,itemCode); pstmtStock.setString(1,itemCode);
pstmtStock.setString(2,siteCode); pstmtStock.setString(2,siteCodeShip);
pstmtStock.setDouble(3,minSelfLife); pstmtStock.setDouble(3,minSelfLife);
//added by ritesh 0n 7/8/13 for request DI3ESUN009 START //added by ritesh 0n 7/8/13 for request DI3ESUN009 START
if("N".equalsIgnoreCase(activeAllow)) if("N".equalsIgnoreCase(activeAllow))
...@@ -1650,7 +1658,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1650,7 +1658,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
rs = pstmtStock.executeQuery(); rs = pstmtStock.executeQuery();
System.out.println("siteCode------"+ siteCode); System.out.println("siteCode------"+ siteCodeShip);
System.out.println("itemCode------"+ itemCode); System.out.println("itemCode------"+ itemCode);
System.out.println("Select completed"); System.out.println("Select completed");
while(rs.next()) while(rs.next())
...@@ -1682,7 +1690,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1682,7 +1690,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
invallocTrace.setRefSer("S-ALC"); invallocTrace.setRefSer("S-ALC");
invallocTrace.setRefId(saleOrder); invallocTrace.setRefId(saleOrder);
invallocTrace.setRefLine(lineNo); invallocTrace.setRefLine(lineNo);
invallocTrace.setSiteCode(siteCode); invallocTrace.setSiteCode(siteCodeShip);
invallocTrace.setItemCode(itemCode); invallocTrace.setItemCode(itemCode);
invallocTrace.setLocCode(locCode); invallocTrace.setLocCode(locCode);
invallocTrace.setLotNo(lotNo); invallocTrace.setLotNo(lotNo);
...@@ -1843,8 +1851,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1843,8 +1851,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
pstmtStockInsertSordAlloc.setString(4, itemCodeOrd); pstmtStockInsertSordAlloc.setString(4, itemCodeOrd);
System.out.println("itemCode------->"+itemCodeOrd); System.out.println("itemCode------->"+itemCodeOrd);
//SITE_CODE //SITE_CODE
pstmtStockInsertSordAlloc.setString(5, siteCode); pstmtStockInsertSordAlloc.setString(5, siteCodeShip);
System.out.println("siteCode------->"+siteCode); System.out.println("siteCode------->"+siteCodeShip);
//ITEM_CODE //ITEM_CODE
pstmtStockInsertSordAlloc.setString(6, itemCode); pstmtStockInsertSordAlloc.setString(6, itemCode);
System.out.println("itemCode------->"+itemCode); System.out.println("itemCode------->"+itemCode);
......
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