Commit 7500796e authored by sbade's avatar sbade

changed the feching syntax for innerhashmap


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93590 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c38f875d
...@@ -4036,10 +4036,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4036,10 +4036,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) if (rs.next())
{ {
distOrder = checkNull(rs.getString("DIST_ORDER")); distOrder = checkNull(rs.getString("DIST_ORDER"));
//row = row + 1; //commented by swati on 11 SEP 2013
sql = "SELECT TRAN_ID FROM DISTORD_ISS WHERE DIST_ORDER = ? AND CONFIRMED = 'Y' "; sql = "SELECT TRAN_ID FROM DISTORD_ISS WHERE DIST_ORDER = ? AND CONFIRMED = 'Y' ";
...@@ -4048,7 +4047,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4048,7 +4047,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
// distIss[row] = checkNull(rs1.getString("TRAN_ID"));
distIss= checkNull(rs1.getString("TRAN_ID")); distIss= checkNull(rs1.getString("TRAN_ID"));
} }
else else
...@@ -4085,7 +4083,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4085,7 +4083,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
return retString; return retString;
} }
row++; // increameted row here by swati 11 SEP 2013
pstmt1.close(); pstmt1.close();
pstmt1= null; pstmt1= null;
rs1.close(); rs1.close();
...@@ -4127,10 +4125,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4127,10 +4125,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
Map<String, HashMap<String, String>> outerHashMap = new HashMap<String,HashMap<String,String>>(); Map<String, HashMap<String, String>> outerHashMap = new HashMap<String,HashMap<String,String>>();
HashMap<String,String> innerHashMap = new HashMap<String,String>();
while (rs.next()) while (rs.next())
{ {
HashMap<String,String> innerHashMap = new HashMap<String,String>();
purcOrderTemp = checkNull(rs.getString("PURC_ORDER")); purcOrderTemp = checkNull(rs.getString("PURC_ORDER"));
lnoOrdTemp = checkNull(rs.getString("LINE_NO__ORD")); lnoOrdTemp = checkNull(rs.getString("LINE_NO__ORD"));
itemCodeTemp = checkNull(rs.getString("ITEM_CODE")); itemCodeTemp = checkNull(rs.getString("ITEM_CODE"));
...@@ -4140,7 +4139,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4140,7 +4139,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
unitTemp = checkNull(rs.getString("UNIT")); unitTemp = checkNull(rs.getString("UNIT"));
lnoPoRcpDet = checkNull(rs.getString("LINE_NO")); lnoPoRcpDet = checkNull(rs.getString("LINE_NO"));
int lnoPoRcpDetInInt = Integer.parseInt(lnoPoRcpDet); //int lnoPoRcpDetInInt = Integer.parseInt(lnoPoRcpDet);
/*purcOrderDet[lnoPoRcpDetInInt] = purcOrderTemp;*/ /*purcOrderDet[lnoPoRcpDetInInt] = purcOrderTemp;*/
//purcOrderDet.add(lnoPoRcpDetInInt,purcOrderTemp); //purcOrderDet.add(lnoPoRcpDetInInt,purcOrderTemp);
//lineNoOrd.add(lnoPoRcpDetInInt,lnoOrdTemp); //lineNoOrd.add(lnoPoRcpDetInInt,lnoOrdTemp);
...@@ -4181,7 +4180,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4181,7 +4180,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
//pstmt1.setString(2,itemCodeRcp.get(lnoPoRcpDetInInt)); //replaced by swati //pstmt1.setString(2,itemCodeRcp.get(lnoPoRcpDetInInt)); //replaced by swati
pstmt1.setString(2,innerHashMap.get("itemCodeRcp")); pstmt1.setString(2,((outerHashMap.get(entry.getKey())).get("itemCodeRcp"))); //innerHashMap.get("itemCodeRcp")
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
...@@ -4199,7 +4198,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4199,7 +4198,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
sql = "SELECT LOC_CODE__APRV FROM SITEITEM WHERE ITEM_CODE = ? AND SITE_CODE = ? "; sql = "SELECT LOC_CODE__APRV FROM SITEITEM WHERE ITEM_CODE = ? AND SITE_CODE = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
//pstmt1.setString(1, itemCodeRcp.get(lnoPoRcpDetInInt));//replaced by swati //pstmt1.setString(1, itemCodeRcp.get(lnoPoRcpDetInInt));//replaced by swati
pstmt1.setString(1,innerHashMap.get("itemCodeRcp")); pstmt1.setString(1,((outerHashMap.get(entry.getKey())).get("itemCodeRcp")));
pstmt1.setString(2, sordSite ); pstmt1.setString(2, sordSite );
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
...@@ -4211,7 +4210,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4211,7 +4210,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
sql = "SELECT LOC_CODE FROM ITEM WHERE ITEM_CODE = ?"; sql = "SELECT LOC_CODE FROM ITEM WHERE ITEM_CODE = ?";
pstmt2 = conn.prepareStatement(sql); pstmt2 = conn.prepareStatement(sql);
//pstmt2.setString(1,itemCodeRcp.get(lnoPoRcpDetInInt)); //pstmt2.setString(1,itemCodeRcp.get(lnoPoRcpDetInInt));
pstmt2.setString(1,innerHashMap.get("itemCodeRcp")); pstmt2.setString(1,((outerHashMap.get(entry.getKey())).get("itemCodeRcp")));
rs2 = pstmt2.executeQuery(); rs2 = pstmt2.executeQuery();
if ( rs2.next() ) if ( rs2.next() )
{ {
...@@ -4236,7 +4235,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4236,7 +4235,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
//cctrGl=finCommon.getFromAcctDetr(itemCodeRcp.get(lnoPoRcpDetInInt) , itemSer, "CONVGL", conn); //replaced by swati //cctrGl=finCommon.getFromAcctDetr(itemCodeRcp.get(lnoPoRcpDetInInt) , itemSer, "CONVGL", conn); //replaced by swati
cctrGl=finCommon.getFromAcctDetr(innerHashMap.get("itemCodeRcp") , itemSer, "CONVGL", conn); cctrGl=finCommon.getFromAcctDetr(((outerHashMap.get(entry.getKey())).get("itemCodeRcp")) , itemSer, "CONVGL", conn);
acctGl = distCommon.getToken(cctrGl, "~t"); acctGl = distCommon.getToken(cctrGl, "~t");
if ( acctGl.trim().length() == 0 ) if ( acctGl.trim().length() == 0 )
{ {
...@@ -4288,10 +4287,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4288,10 +4287,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//pstmtRbHdr.setString(5, bomCodeOrd.get(lnoPoRcpDetInInt)); //pstmtRbHdr.setString(5, bomCodeOrd.get(lnoPoRcpDetInInt));
//pstmtRbHdr.setDouble(6, quantityPoRcpDet.get(lnoPoRcpDetInInt)); //pstmtRbHdr.setDouble(6, quantityPoRcpDet.get(lnoPoRcpDetInInt));
//pstmtRbHdr.setString(7, unitOrd.get(lnoPoRcpDetInInt)); //pstmtRbHdr.setString(7, unitOrd.get(lnoPoRcpDetInInt));
pstmtRbHdr.setString(4,innerHashMap.get("itemCodeRcp")); pstmtRbHdr.setString(4,((outerHashMap.get(entry.getKey())).get("itemCodeRcp")));
pstmtRbHdr.setString(5, innerHashMap.get("bomCodeOrd")); pstmtRbHdr.setString(5, ((outerHashMap.get(entry.getKey())).get("bomCodeOrd")));
pstmtRbHdr.setDouble(6, Double.parseDouble(innerHashMap.get("quantityPoRcpDet"))); pstmtRbHdr.setDouble(6, Double.parseDouble(((outerHashMap.get(entry.getKey())).get("quantityPoRcpDet"))));
pstmtRbHdr.setString(7, innerHashMap.get("unitOrd")); pstmtRbHdr.setString(7, ((outerHashMap.get(entry.getKey())).get("unitOrd")));
pstmtRbHdr.setString(8, "J"); pstmtRbHdr.setString(8, "J");
pstmtRbHdr.setString(9, "1S"); pstmtRbHdr.setString(9, "1S");
pstmtRbHdr.setString(10, "N"); pstmtRbHdr.setString(10, "N");
...@@ -4314,8 +4313,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4314,8 +4313,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//commented by swati //commented by swati
//bomXml = bomXml + "<bom_code>"+bomCodeOrd.get(lnoPoRcpDetInInt)+"</bom_code>\r\n"; //bomXml = bomXml + "<bom_code>"+bomCodeOrd.get(lnoPoRcpDetInInt)+"</bom_code>\r\n";
//bomXml = bomXml + "<quantity>"+quantityPoRcpDet.get(lnoPoRcpDetInInt)+"</quantity>\r\n"; //bomXml = bomXml + "<quantity>"+quantityPoRcpDet.get(lnoPoRcpDetInInt)+"</quantity>\r\n";
bomXml = bomXml + "<bom_code>"+innerHashMap.get("bomCodeOrd")+"</bom_code>\r\n"; bomXml = bomXml + "<bom_code>"+((outerHashMap.get(entry.getKey())).get("bomCodeOrd"))+"</bom_code>\r\n";
bomXml = bomXml + "<quantity>"+Double.parseDouble(innerHashMap.get("quantityPoRcpDet"))+"</quantity>\r\n"; bomXml = bomXml + "<quantity>"+Double.parseDouble(((outerHashMap.get(entry.getKey())).get("quantityPoRcpDet")))+"</quantity>\r\n";
bomXml = bomXml + "<work_order>" + "XYZ" + "</work_order>\r\n"; bomXml = bomXml + "<work_order>" + "XYZ" + "</work_order>\r\n";
bomXml = bomXml + "<exp_lev>"+1 + "</exp_lev>\r\n"; bomXml = bomXml + "<exp_lev>"+1 + "</exp_lev>\r\n";
...@@ -4339,12 +4338,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4339,12 +4338,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
itemCodeDet = genericUtility.getColumnValueFromNode( "item_code", detlList.item(cntr) ); itemCodeDet = genericUtility.getColumnValueFromNode( "item_code", detlList.item(cntr) );
qtyDet =Double.parseDouble(genericUtility.getColumnValueFromNode( "quantity", detlList.item(cntr))); qtyDet =Double.parseDouble(genericUtility.getColumnValueFromNode( "quantity", detlList.item(cntr)));
setRow = 1; setRow = 1;
//for ( iRow = 1 ; iRow <= distIss.size(); iRow++ )
//{
distIssTid =distIss; distIssTid =distIss;
sql="SELECT " + func + "('" + distIssTid +"','ABC') "+" FROM DUAL"; sql="SELECT " + func + "('" + distIssTid +"','ABC') "+" FROM DUAL";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
...@@ -4414,9 +4409,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4414,9 +4409,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1 = null; pstmt1 = null;
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
//}
//--
if ( qtyDet > chkQty ) if ( qtyDet > chkQty )
{ {
sql = "SELECT (CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) - (CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END), STOCK.UNIT, STOCK.LOC_CODE, STOCK.LOT_NO, STOCK.LOT_SL, STOCK.RATE FROM STOCK,LOCATION,INVSTAT WHERE STOCK.LOC_CODE = LOCATION.LOC_CODE AND ((CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END)-(CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END)) > 0 AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND STOCK.SITE_CODE = ? AND STOCK.ITEM_CODE = ? AND (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) >= 0 AND INVSTAT.AVAILABLE = ? AND STOCK.LOT_NO NOT IN (SELECT LOT_NO FROM DISTORD_ISSDET WHERE DISTORD_ISSDET.TRAN_ID = ? AND DISTORD_ISSDET.ITEM_CODE = ? )ORDER BY STOCK.PARTIAL_USED, (CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END),STOCK.CREA_DATE, STOCK.LOT_NO, STOCK.LOT_SL "; sql = "SELECT (CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) - (CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END), STOCK.UNIT, STOCK.LOC_CODE, STOCK.LOT_NO, STOCK.LOT_SL, STOCK.RATE FROM STOCK,LOCATION,INVSTAT WHERE STOCK.LOC_CODE = LOCATION.LOC_CODE AND ((CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END)-(CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END)) > 0 AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND STOCK.SITE_CODE = ? AND STOCK.ITEM_CODE = ? AND (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) >= 0 AND INVSTAT.AVAILABLE = ? AND STOCK.LOT_NO NOT IN (SELECT LOT_NO FROM DISTORD_ISSDET WHERE DISTORD_ISSDET.TRAN_ID = ? AND DISTORD_ISSDET.ITEM_CODE = ? )ORDER BY STOCK.PARTIAL_USED, (CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END),STOCK.CREA_DATE, STOCK.LOT_NO, STOCK.LOT_SL ";
...@@ -4473,11 +4466,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4473,11 +4466,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
conv = 0; conv = 0;
// convQtyList=distCommon.convQtyFactor(unitDet,unitOrd.get(lnoPoRcpDetInInt), itemCodeDet, updQty, conv, conn); // convQtyList=distCommon.convQtyFactor(unitDet,unitOrd.get(lnoPoRcpDetInInt), itemCodeDet, updQty, conv, conn);
convQtyList=distCommon.convQtyFactor(unitDet,innerHashMap.get("unitOrd"), itemCodeDet, updQty, conv, conn); convQtyList=distCommon.convQtyFactor(unitDet,((outerHashMap.get(entry.getKey())).get("unitOrd")), itemCodeDet, updQty, conv, conn);
conv = Double.parseDouble(convQtyList.get(0).toString()); conv = Double.parseDouble(convQtyList.get(0).toString());
convQty = Double.parseDouble( convQtyList.get(1).toString()); convQty = Double.parseDouble( convQtyList.get(1).toString());
convRateList= distCommon.convQtyFactor(unitDet,innerHashMap.get("unitOrd"), itemCodeDet, rate.get(iRow), conv,conn); convRateList= distCommon.convQtyFactor(unitDet,((outerHashMap.get(entry.getKey())).get("unitOrd")), itemCodeDet, rate.get(iRow), conv,conn);
conv = Double.parseDouble(convRateList.get(0).toString()); conv = Double.parseDouble(convRateList.get(0).toString());
convRate = Double.parseDouble( convRateList.get(1).toString()); convRate = Double.parseDouble( convRateList.get(1).toString());
...@@ -4500,7 +4493,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4500,7 +4493,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbDet.setDouble(5, updQty ); pstmtRbDet.setDouble(5, updQty );
pstmtRbDet.setString(6, unitDet ); pstmtRbDet.setString(6, unitDet );
/*pstmtRbDet.setString(7, unitOrd[lnoPoRcpDetInInt]);*/ /*pstmtRbDet.setString(7, unitOrd[lnoPoRcpDetInInt]);*/
pstmtRbDet.setString(7, innerHashMap.get("unitOrd")); pstmtRbDet.setString(7, ((outerHashMap.get(entry.getKey())).get("unitOrd")));
//pstmtRbDet.setString(8, locCode[iRow] ); //pstmtRbDet.setString(8, locCode[iRow] );
pstmtRbDet.setString(8, locCode.get(iRow)); pstmtRbDet.setString(8, locCode.get(iRow));
pstmtRbDet.setString(9, lotNo.get(iRow)); pstmtRbDet.setString(9, lotNo.get(iRow));
...@@ -4573,6 +4566,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4573,6 +4566,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
while ( rs1.next() ) while ( rs1.next() )
{ {
HashMap<String,String> innerHashMap = new HashMap<String,String>();
currRow=currRow+1; currRow=currRow+1;
purcOrderTemp = checkNull(rs1.getString("PURC_ORDER")); purcOrderTemp = checkNull(rs1.getString("PURC_ORDER"));
lnoOrdTemp = checkNull(rs1.getString("LINE_NO__ORD")); lnoOrdTemp = checkNull(rs1.getString("LINE_NO__ORD"));
......
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