Commit 7da2e2b8 authored by smane's avatar smane

Changes made for lock_group in porcp detail (D14DSUN019)


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95739 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2064605e
......@@ -1090,7 +1090,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
/////////////////////////////////////////////////
// populate the supplier lock list
System.out.println(">>>>>>>>>>>>>>>>>>>Before add to lckGroup in supplier:"+lckGroup);
/*System.out.println(">>>>>>>>>>>>>>>>>>>Before add to lckGroup in supplier:"+lckGroup); //comment added by sagar on 24/07/14
sql = "select lock_group From supplier "
+ " where supp_code = ? " ;
pstmt = conn.prepareStatement(sql);
......@@ -1121,7 +1122,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt = null;
rs.close();
rs = null;
}
} */
/////////////////////////////////////////////////
sql = "SELECT SHIPPER_SIZE, GROSS_WEIGHT, NET_WEIGHT FROM ITEM_LOT_PACKSIZE WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? ";
......@@ -1222,7 +1223,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
// itemLockList
// lockCodeWiseMap
tempLockGroup = null;
sql = "select lock_group "
/*sql = "select lock_group "
+ " from supplieritem "
+ " Where supp_code = ? And item_code = ?";
pstmt1 = conn.prepareStatement(sql);
......@@ -1238,7 +1240,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1 = null;
rs1.close();
rs1 = null;
itemLockList = null;
//Added by Sagar M. on 06/05/14 start
if(tempLockGroup != null && tempLockGroup.trim().length() > 0)
{
......@@ -1250,19 +1251,82 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
lckGroup=lockGroup;
System.out.println(">>>>>>>>Add to lckGroup for supplier:"+lckGroup);
}
//Added by Sagar M. on 06/05/14 end
if (tempLockGroup != null && tempLockGroup.trim().length() > 0)
//Added by Sagar M. on 06/05/14 end */ //comment by sagar on 24/07/14
//added by sagar on 24/07/14
lockGroup="";
sql = "select lock_group from itemmnfr where item_code= ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, itemCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
lockGroup = rs1.getString("lock_group");
}
pstmt1.close();
pstmt1 = null;
rs1.close();
rs1 = null;
if(lockGroup==null || lockGroup.trim().length() == 0)
{
sql = "select lock_group from site_supplier where site_code= ? and supp_code= ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, siteRcp);
pstmt1.setString(2, suppCode);
rs1 = pstmt1.executeQuery();
if ( rs1.next() )
{
lockGroup = rs1.getString("lock_group");
}
pstmt1.close();
pstmt1 = null;
rs1.close();
rs1 = null;
if(lockGroup==null || lockGroup.trim().length() == 0)
{
sql = "select lock_group from supplier where supp_code= ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, suppCode);
rs1 = pstmt1.executeQuery();
if ( rs1.next() )
{
lockGroup = rs1.getString("lock_group");
}
pstmt1.close();
pstmt1 = null;
rs1.close();
rs1 = null;
if(lockGroup==null || lockGroup.trim().length() == 0)
{
sql = "select lock_group from siteitem where site_code= ? and item_code= ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, siteRcp);
pstmt1.setString(2, itemCode);
rs1 = pstmt1.executeQuery();
if ( rs1.next() )
{
lockGroup = rs1.getString("lock_group");
}
pstmt1.close();
pstmt1 = null;
rs1.close();
rs1 = null;
}
}
}
itemLockList = null;
System.out.println(">>>>>>>>>>>lockGroup:"+lockGroup);
if (lockGroup != null && lockGroup.trim().length() > 0)
{
itemLockList = new ArrayList();
sql = "select lock_code from lock_group "
+ " where lock_group = ? " ;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, tempLockGroup);
pstmt1.setString(1, lockGroup);
rs1 = pstmt1.executeQuery();
while ( rs1.next() )
while (rs1.next())
{
lockCode = rs1.getString("lock_code");
System.out.println(">>>>>>>>>>>>>found lockCode:"+lockCode);
itemLockList.add(lockCode);
}
pstmt1.close();
......@@ -1270,10 +1334,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1.close();
rs1 = null;
}
else if(suppLockList.size() > 0)
/*else if(suppLockList.size() > 0)
{
itemLockList = suppLockList;
}
}*/ //comment added by sagar on 24/07/14
if ( itemLockList != null && itemLockList.size() > 0 )
{
for (int ctr = 0; ctr < itemLockList.size(); ctr ++)
......@@ -1309,6 +1373,19 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
}
}
}
//update lock_group in porcpdet table, added by sagar on 25/07/14
if (lockGroup != null && lockGroup.trim().length() > 0)
{
System.out.println(">>>>>>>>Updating Porcpdet table>>>>>>>>>>>>>>>>>");
sql = "update porcpdet set lock_group= ? where tran_id = ? and line_no = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, lockGroup);
pstmt1.setString(2, tranId);
pstmt1.setString(3, lineNo);
updCnt = pstmt1.executeUpdate();
pstmt1.close();
pstmt1 = null;
}
///////////////////////////////////////////////////////////////////////////////
if (purcOrder != null )
{
......@@ -1930,6 +2007,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{
Map.Entry itemMapEntry = (Map.Entry)itrItem.next();
lockCode = (String)itemMapEntry.getKey();
System.out.println(">>>>>>>>>Generate inv hold lockCode:"+lockCode);
tempList = (ArrayList)lockCodeWiseMap.get(lockCode);
errString = invHoldGen.generateHoldTrans(lockCode, tranId, "P-RCP", siteRcp, tempList, xtraParams, conn );
if(errString != null && errString.trim().length() > 0 )
......
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