Skip to content

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

Update by Manoj Sharma on 05/02/13 issue resolved to suggest correct loc type 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92642 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 88a24a84
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
webitm-wms/ibase/webitm/ejb/wms/ExpStkTransferPos.java
View file @ fc5b0b10
......@@ -54,7 +54,8 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
String lockCode = "";
ArrayList stockList = new ArrayList();
ArrayList<String> tranIdRel = new ArrayList<String>();
//ArrayList<String> tranIdRel = new ArrayList<String>();
String tranIdRel = "";
int invRel = 0;
int invRelDet = 0;
......@@ -74,7 +75,7 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
InvHoldGen holdGen = new InvHoldGen();
try
{
conn.setAutoCommit(false);
//conn.setAutoCommit(false);
siteCode = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginEmpCode" );
......@@ -112,22 +113,23 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
"VALUES(?,?,?,?)";
System.out.println("parentNodeListLength***************************************"+parentNodeListLength);
//tranIdRel.add(getTranId("w_inv_hold_rel", conn));
//Added by manoj sharma 29/01/2013 to generate tranid as per keystring
tranIdRel=generateTranId( "w_inv_hold_rel", siteCode, conn );
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, tranIdRel );
pstmt.setDate( 2, currDate );
pstmt.setString( 3, siteCode );
pstmt.setString( 4, "N" );
pstmt.setString( 5, loginEmpCode );
pstmt.setString( 6, chgUser );
pstmt.setString( 7, chgTerm );
pstmt.setDate( 8,currDate );
invRel = pstmt.executeUpdate();
for(int row = 0; row < parentNodeListLength; row++)
{
detLine++;
//tranIdRel.add(getTranId("w_inv_hold_rel", conn));
//Added by manoj sharma 29/01/2013 to generate tranid as per keystring
tranIdRel.add(generateTranId( "w_inv_hold_rel", siteCode, conn ));
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, tranIdRel.get(row) );
pstmt.setDate( 2, currDate );
pstmt.setString( 3, siteCode );
pstmt.setString( 4, "N" );
pstmt.setString( 5, loginEmpCode );
pstmt.setString( 6, chgUser );
pstmt.setString( 7, chgTerm );
pstmt.setDate( 8,currDate );
invRel = pstmt.executeUpdate();
//Changed by sumit in 08/09/12 changed detail number start
/*lineNoHold = GenericUtility.getInstance().getColumnValueFromNode("line_no_hold", dom.getElementsByTagName("Detail2").item(row));
......@@ -143,9 +145,7 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
//Changed by sumit in 01/10/12 getting detail start
HashMap dataMap = new HashMap();
//Added by manoj dtd 29/01/2013 to save reference in inv hold transaction
//dataMap.put("tran_id_hold",GenericUtility.getInstance().getColumnValueFromNode("tran_id_hold", dom.getElementsByTagName("Detail3").item(row)));
dataMap.put("item_code",GenericUtility.getInstance().getColumnValueFromNode("item_code", dom.getElementsByTagName("Detail3").item(row)));
dataMap.put("item_code",GenericUtility.getInstance().getColumnValueFromNode("item_code", dom.getElementsByTagName("Detail3").item(row)));
dataMap.put("site_code",siteCode);
dataMap.put("loc_code",GenericUtility.getInstance().getColumnValueFromNode("loc_code__to", dom.getElementsByTagName("Detail3").item(row)));
dataMap.put("lot_sl",GenericUtility.getInstance().getColumnValueFromNode("lot_sl__to", dom.getElementsByTagName("Detail3").item(row)));
......@@ -154,7 +154,7 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
//Changed by sumit in 08/09/12 getting detail end
pstmtDet = conn.prepareStatement(sqlDet);
pstmtDet.setString( 1,tranIdRel.get(row));
pstmtDet.setString( 1,tranIdRel);
pstmtDet.setInt( 2,detLine );
pstmtDet.setString( 3,tranIdHold );
pstmtDet.setInt( 4,Integer.parseInt(lineNoHold.trim()) );
......@@ -176,12 +176,14 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
{
//Chnaged by sumit on
//conn.commit();
for(int j = 0;j<tranIdRel.size();j++)
{
System.out.println("Confirmation is called for Tran ID"+tranIdRel.get(j));
//for(int j = 0;j<tranIdRel.size();j++)
//{
System.out.println("Confirmation is called for Tran ID"+tranIdRel);
//errString = invHldRelCon.confirm(tranIdRel.get(j),xtraParams,"F");
errString = invHldRelCon.confirm(tranIdRel.get(j),xtraParams,"F", conn, false);
}
//errString = invHldRelCon.confirm(tranIdRel.get(j),xtraParams,"F", conn, false);
//Changed by manoj dtd 30/01/2013 to confirm release transaction
errString = invHldRelCon.confirm(tranIdRel,xtraParams,"F", conn, false);
//}
}
//Changed by sumit on 17/09/12 as per manoharan and client do not release lock end.
......@@ -198,11 +200,11 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
//Changed by sumit on 01/10/12 insert new hold start.
if( "NEXP_LOCK".equalsIgnoreCase(lockCode) && stockList.size() > 0 )
{
holdGen.generateHoldTrans( lockCode, "NEAREXPIRY","NEXP", siteCode, stockList, xtraParams, conn );
holdGen.generateHoldTrans( lockCode, tranIdHold,"NEXP", siteCode, stockList, xtraParams, conn );
}
else if( "EXP_LOCK".equalsIgnoreCase(lockCode) && stockList.size() > 0 )
{
holdGen.generateHoldTrans( lockCode, "EXPIRED","EXP", siteCode, stockList, xtraParams, conn );
holdGen.generateHoldTrans( lockCode, tranIdHold,"EXP", siteCode, stockList, xtraParams, conn );
}
//Changed by sumit on 01/10/12 insert new hold end.
......@@ -629,4 +631,3 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
}//generateTranTd()
}
webitm-wms/ibase/webitm/ejb/wms/ExpStockTransferIC.java
View file @ fc5b0b10
......@@ -718,7 +718,6 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
}
else
{
//Changed by Manoj dtd 30/01/2013 Error Code corrected
errList.add( "INVLOCSTAT" );
errFields.add( childNodeName.toLowerCase() );
}
......@@ -1586,7 +1585,7 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
" AND H.LOT_NO = S.LOT_NO " +
" AND H.LOT_SL = S.LOT_SL " +
" AND S.QUANTITY > 0 " +
" AND S.INV_STAT <> ? ";
" AND S.INV_STAT <> ? AND I.REF_ID IN('NEAREXPIRY','EXPIRED') ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "H");
......
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