Skip to content

B
business-java
Commit 227372d5 authored by rtiwari's avatar rtiwari
Browse files
Options

updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95729 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bfef682a
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 24 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAllocIc.java
View file @ 227372d5
...@@ -457,7 +457,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto ...@@ -457,7 +457,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
itemCode = genericUtility.getColumnValue("item_code", dom); itemCode = genericUtility.getColumnValue("item_code", dom);
siteCode = genericUtility.getColumnValue("site_code", dom); siteCode = genericUtility.getColumnValue("site_code", dom);
locCode = genericUtility.getColumnValue("loc_code", dom); locCode = genericUtility.getColumnValue("loc_code", dom);
lotNo = genericUtility.getColumnValue("lot_no", dom); lotNo = genericUtility.getColumnValue("lot_no", dom);
Map tempMap = new HashMap(); Map tempMap = new HashMap();
...@@ -1060,12 +1059,18 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto ...@@ -1060,12 +1059,18 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
} }
else if(currentColumn.trim().equalsIgnoreCase("lot_no")) else if(currentColumn.trim().equalsIgnoreCase("lot_no"))
{ {
HashMap stockLot=new HashMap<String,Double>();
HashMap<String,ArrayList<String>>stockLotDetail=new HashMap<String, ArrayList<String>>(); // ADDED BY RITESH ON 30/06/14
lotNo = checkNull(genericUtility.getColumnValue("lot_no", dom)); lotNo = checkNull(genericUtility.getColumnValue("lot_no", dom));
saleOrder = checkNull(genericUtility.getColumnValue("sale_order", dom)); saleOrder = checkNull(genericUtility.getColumnValue("sale_order", dom));
lineNoSord = checkNull(genericUtility.getColumnValue("line_no__sord", dom)); lineNoSord = checkNull(genericUtility.getColumnValue("line_no__sord", dom));
itemCode = checkNull(genericUtility.getColumnValue("item_code", dom)); itemCode = checkNull(genericUtility.getColumnValue("item_code", dom));
System.out.println(" saleOrder ["+saleOrder+"] lot no ["+lotNo+"] itemCode["+itemCode+"]"); System.out.println(" saleOrder ["+saleOrder+"] lot no ["+lotNo+"] itemCode["+itemCode+"]");
activePickAllow=genericUtility.getColumnValue("active_pick_allow", dom1); activePickAllow=genericUtility.getColumnValue("active_pick_allow", dom1);
siteCode = checkNull(genericUtility.getColumnValue("site_code", dom)); // ADDED BY RITESH
System.out.println("siteCode::DETAIL"+siteCode);
activePickAllow=activePickAllow==null?"Y":activePickAllow; activePickAllow=activePickAllow==null?"Y":activePickAllow;
String getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, " String getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
...@@ -1230,9 +1235,9 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto ...@@ -1230,9 +1235,9 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
pstmt = conn.prepareStatement(sSingleLotSql + orderByStkStr); pstmt = conn.prepareStatement(sSingleLotSql + orderByStkStr);
pstmt.setString(1,itemCode); pstmt.setString(1,itemCode);
pstmt.setString(2,siteCode); pstmt.setString(2,siteCodeShip);
pstmt.setString(3,itemCode); pstmt.setString(3,itemCode);
pstmt.setString(4,siteCode); pstmt.setString(4,siteCodeShip);
pstmt.setString(5,lotNo); pstmt.setString(5,lotNo);
//pstmt.setDouble(6,pendingQty); //pstmt.setDouble(6,pendingQty);
pstmt.setInt(6,minSelfLife); pstmt.setInt(6,minSelfLife);
...@@ -1250,18 +1255,101 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto ...@@ -1250,18 +1255,101 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
String lotSl = ""; String lotSl = "";
locCode = ""; locCode = "";
locDescr = ""; locDescr = "";
if( rs.next()) System.out.println("==singleLot=="+singleLot); // ADDED BY RITESH ON 30/06/14 START
if("N".equalsIgnoreCase(singleLot.trim()))
{ {
qtyAvail = rs.getDouble("QTY_AVAIL_ALLOC"); //quantity if( rs.next())
lotSl = rs.getString("LOT_SL"); {
locCode = rs.getString("LOC_CODE"); qtyAvail = rs.getDouble("QTY_AVAIL_ALLOC"); //quantity
locDescr = rs.getString("DESCR"); lotSl = rs.getString("LOT_SL");
locCode = rs.getString("LOC_CODE");
locDescr = rs.getString("DESCR");
}
if(pendingQty < qtyAvail)
{
qtyAvail = pendingQty;
}
} }
if("Y".equalsIgnoreCase(singleLot.trim()))
if(pendingQty < qtyAvail)
{ {
qtyAvail = pendingQty;
} while(rs.next())
{
lotNo=rs.getString("LOT_NO");
lotNo = rs.getString("LOT_NO");
lotSl = rs.getString("LOT_SL");
locCode = rs.getString("LOC_CODE");
qtyAvail = rs.getDouble("QTY_AVAIL_ALLOC");
locDescr = rs.getString("DESCR");
if(stockLot.containsKey(lotNo))
{
stockLot.put(lotNo, ((Double)stockLot.get(lotNo)+qtyAvail));
ArrayList<String> stockList=new ArrayList<String>();
stockList=stockLotDetail.get(lotNo);
stockList.add(lotNo+"@"+lotSl+"@"+locCode+"@"+locDescr+"@"+qtyAvail);
stockLotDetail.put(lotNo, stockList);
}
else
{
stockLot.put(lotNo,qtyAvail);
ArrayList<String> stockList=new ArrayList<String>();
//stockList=stockLotDetail.get(lotNo);
System.out.println(lotNo+"@"+lotSl+"@"+locCode+"@"+locDescr+"@"+qtyAvail);
stockList.add(lotNo+"@"+lotSl+"@"+locCode+"@"+locDescr+"@"+qtyAvail);
stockLotDetail.put(lotNo, stockList);
}
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
String lotDetail="";
Set<String> lotKey=stockLot.keySet();
Iterator<String> lot=lotKey.iterator();
while(lot.hasNext())
{
String lotKeyVal=lot.next();
double qty=Double.parseDouble(""+stockLot.get(lotKeyVal));
System.out.println("qty---"+qty+"---pendingQty---"+pendingQty);
if(qty>=pendingQty)
{
lotDetail=stockLotDetail.get(lotKeyVal).get(0);
break;
}
}
// Enumeration enu = Collections.enumeration(lotKey);
// while(enu.hasMoreElements())
// {
// String lotKeyVal=(String)enu.nextElement();
// double qty=Double.parseDouble(""+stockLot.get(lotKeyVal));
// System.out.println("qty--1-"+qty+"---pendingQty--1-"+pendingQty);
// if(qty>=pendingQty)
// {
// lotDetail=stockLotDetail.get(lotKeyVal).get(0);
// break;
// }
// }
lotNo="";
lotSl="";
locCode="";
locDescr="";
qtyAvail=0;
if(lotDetail.length()>0)
{
String[] lotArray=lotDetail.split("@");
lotNo=lotArray[0];
lotSl=lotArray[1];
locCode=lotArray[2];
locDescr=lotArray[3];
qtyAvail=Double.parseDouble(lotArray[4]);
//qtyAvail=pendingQty;
}
} // ADDED BY RITESH ON 30/06/14 END for issue no . 209
valueXmlString.append("<quantity>").append("<![CDATA[" + qtyAvail + "]]>").append("</quantity>"); valueXmlString.append("<quantity>").append("<![CDATA[" + qtyAvail + "]]>").append("</quantity>");
valueXmlString.append("<lot_sl>").append("<![CDATA[" + lotSl + "]]>").append("</lot_sl>"); valueXmlString.append("<lot_sl>").append("<![CDATA[" + lotSl + "]]>").append("</lot_sl>");
valueXmlString.append("<loc_code>").append("<![CDATA[" + locCode + "]]>").append("</loc_code>"); valueXmlString.append("<loc_code>").append("<![CDATA[" + locCode + "]]>").append("</loc_code>");
...@@ -1695,6 +1783,10 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto ...@@ -1695,6 +1783,10 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
ResultSet rs = null; ResultSet rs = null;
Map stockDetail = new HashMap(); Map stockDetail = new HashMap();
DistCommon discommon = new DistCommon(); DistCommon discommon = new DistCommon();
TreeMap stockLot=new TreeMap<String,Double>();
TreeMap<String,ArrayList<String>>stockLotDetail=new TreeMap<String, ArrayList<String>>();
System.out.println("getStockDetail::called::040714");
try try
{ {
String getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, " String getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
...@@ -1827,20 +1919,109 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto ...@@ -1827,20 +1919,109 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
String lotSl = ""; String lotSl = "";
locCode = ""; locCode = "";
locDescr = ""; locDescr = "";
if( rs.next()) if("N".equalsIgnoreCase(singleLot))
{ {
qtyAvail = rs.getDouble("QTY_AVAIL_ALLOC"); //quantity
lotNo = rs.getString("LOT_NO"); if( rs.next())
lotSl = rs.getString("LOT_SL"); {
locCode = rs.getString("LOC_CODE"); qtyAvail = rs.getDouble("QTY_AVAIL_ALLOC"); //quantity
locDescr = rs.getString("DESCR"); lotNo = rs.getString("LOT_NO");
} lotSl = rs.getString("LOT_SL");
rs.close(); rs = null; locCode = rs.getString("LOC_CODE");
pstmt.close(); pstmt = null; locDescr = rs.getString("DESCR");
if(pendingQty < qtyAvail) }
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if(pendingQty < qtyAvail)
{
qtyAvail = pendingQty;
}
}
else
{ {
qtyAvail = pendingQty;
while(rs.next())
{
lotNo=rs.getString("LOT_NO");
lotNo = rs.getString("LOT_NO");
lotSl = rs.getString("LOT_SL");
locCode = rs.getString("LOC_CODE");
qtyAvail = rs.getDouble("QTY_AVAIL_ALLOC");
locDescr = rs.getString("DESCR");
System.out.println("lot_no ::"+lotNo +"== qtyAvail ::"+qtyAvail);
if(stockLot.containsKey(lotNo))
{
stockLot.put(lotNo, ((Double)stockLot.get(lotNo)+qtyAvail));
ArrayList<String> stockList=new ArrayList<String>();
stockList=stockLotDetail.get(lotNo);
stockList.add(lotNo+"@"+lotSl+"@"+locCode+"@"+locDescr+"@"+qtyAvail);
stockLotDetail.put(lotNo, stockList);
}
else
{
stockLot.put(lotNo,qtyAvail);
ArrayList<String> stockList=new ArrayList<String>();
//stockList=stockLotDetail.get(lotNo);
System.out.println(lotNo+"@"+lotSl+"@"+locCode+"@"+locDescr+"@"+qtyAvail);
stockList.add(lotNo+"@"+lotSl+"@"+locCode+"@"+locDescr+"@"+qtyAvail);
stockLotDetail.put(lotNo, stockList);
}
}
stockLotDetail.descendingMap();
stockLot.descendingMap();
rs.close(); rs = null;
pstmt.close(); pstmt = null;
String lotDetail="";
Set<String> lotKey=stockLot.keySet();
System.out.println("lotKey::"+lotKey);
Iterator<String> lot=lotKey.iterator();
while(lot.hasNext())
{
String lotKeyVal=lot.next();
System.out.println("lotKeyVal::"+lotKeyVal);
double qty=Double.parseDouble(""+stockLot.get(lotKeyVal));
System.out.println("qty---1"+qty+"---pendingQty---1"+pendingQty);
if(qty>=pendingQty)
{
lotDetail=stockLotDetail.get(lotKeyVal).get(0);
break;
}
}
// Enumeration enu = Collections.enumeration(lotKey);
// while(enu.hasMoreElements())
// {
// String lotKeyVal=(String)enu.nextElement();
// double qty=Double.parseDouble(""+stockLot.get(lotKeyVal));
// System.out.println("qty--1-"+qty+"---pendingQty--1-"+pendingQty);
// if(qty>=pendingQty)
// {
// lotDetail=stockLotDetail.get(lotKeyVal).get(0);
// break;
// }
// }
lotNo="";
lotSl="";
locCode="";
locDescr="";
qtyAvail=0;
if(lotDetail.length()>0)
{
String[] lotArray=lotDetail.split("@");
lotNo=lotArray[0];
lotSl=lotArray[1];
locCode=lotArray[2];
locDescr=lotArray[3];
qtyAvail=Double.parseDouble(lotArray[4]);
//qtyAvail=pendingQty;
}
} }
System.out.println(" @@@ 30-06-14");
stockDetail.put("qtyAvail", qtyAvail); stockDetail.put("qtyAvail", qtyAvail);
stockDetail.put("lotNo", lotNo); stockDetail.put("lotNo", lotNo);
stockDetail.put("lotSl", lotSl); stockDetail.put("lotSl", lotSl);
...@@ -1875,4 +2056,16 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto ...@@ -1875,4 +2056,16 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
} }
return stockDetail; return stockDetail;
} }
} private String getErrorString(String str ) {
\ No newline at end of file if(str == null)
{
str ="";
}
return str;
// TODO Auto-generated method stub
}
}
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