Skip to content

B
business-java
Commit 5d6e1a10 authored by msharma's avatar msharma
Browse files
Options

Stock transfer corrected location from was updating with loc_code to 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96931 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 51919171
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 146 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/StockTransferConf.java
View file @ 5d6e1a10
...@@ -14,6 +14,7 @@ import ibase.webitm.ejb.dis.InvAllocTraceBean; ...@@ -14,6 +14,7 @@ import ibase.webitm.ejb.dis.InvAllocTraceBean;
import ibase.webitm.ejb.dis.StockUpdate; import ibase.webitm.ejb.dis.StockUpdate;
import ibase.webitm.ejb.fin.FinCommon; import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.fin.InvAcct; import ibase.webitm.ejb.fin.InvAcct;
//import ibase.webitm.utility.GenericUtility;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
...@@ -146,7 +147,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -146,7 +147,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
ResultSet rs = null; ResultSet rs = null;
ResultSet rsStock = null; ResultSet rsStock = null;
ibase.utility.E12GenericUtility genericUtility= new ibase.utility.E12GenericUtility(); ibase.utility.E12GenericUtility genericUtility = new ibase.utility.E12GenericUtility();
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
InvAllocTraceBean invAllocTrace = new InvAllocTraceBean(); InvAllocTraceBean invAllocTrace = new InvAllocTraceBean();
...@@ -551,18 +552,17 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -551,18 +552,17 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
} }
int calcnoArt=(int) (quantity/qtyPerArt); int calcnoArt=(int) (quantity/qtyPerArt);
// ADDED BY RITESH ON 08/07/14 START // ADDED BY RITESH ON 08/07/14 START
// int partialArt=(int) (quantity/qtyPerArt); int partialArt=(int) (quantity/qtyPerArt);
// if(partialArt == 0) if(partialArt == 0)
// { {
// partialArt = 1; partialArt = 1;
// }else }else
// { {
// partialArt = 0; partialArt = 0;
// } }
System.out.println("quantity["+quantity+"]--qtyPerArt["+qtyPerArt+"]--calcnoArt["+calcnoArt+"]--partnoArt["+partnoArt+"]"); System.out.println("quantity["+quantity+"]--qtyPerArt["+qtyPerArt+"]--calcnoArt["+calcnoArt+"]--partnoArt["+partnoArt+"]");
// System.out.println("partialArt -- "+partialArt); System.out.println("partialArt -- "+partialArt);
// updateRowMap.put("no_art", calcnoArt + partialArt); updateRowMap.put("no_art", calcnoArt + partialArt);
updateRowMap.put("no_art", calcnoArt);
// ADDED BY RITESH ON 08/07/14 END // ADDED BY RITESH ON 08/07/14 END
/* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as 0 for issue [END] */ /* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as 0 for issue [END] */
...@@ -599,8 +599,6 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -599,8 +599,6 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
updateRowMap.put("batch_no", batchNo); updateRowMap.put("batch_no", batchNo);
updateRowMap.put("batch_size", ""+batchSize); updateRowMap.put("batch_size", ""+batchSize);
//End changes by gulzar on 12/24/2011 //End changes by gulzar on 12/24/2011
// added by cpatil on 20/11/13 start
//Added by Manoj dtd 29/10/2014 to set hold_lock field //Added by Manoj dtd 29/10/2014 to set hold_lock field
int countHold=0; int countHold=0;
sql="select count(1) From inv_hold a, inv_hold_det b Where a.tran_id = b.tran_id And b.item_code = ? And (b.site_code = ? or b.site_code is null )" + sql="select count(1) From inv_hold a, inv_hold_det b Where a.tran_id = b.tran_id And b.item_code = ? And (b.site_code = ? or b.site_code is null )" +
...@@ -629,7 +627,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -629,7 +627,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
{ {
updateRowMap.put("hold_lock", "Y"); updateRowMap.put("hold_lock", "Y");
} }
// added by cpatil on 20/11/13 start
itemSer = discommon.getItemSer(itemCode, siteCode, tranDate, "","", conn); itemSer = discommon.getItemSer(itemCode, siteCode, tranDate, "","", conn);
cctrCode = finCommon.getAcctDetrTtype(itemCode, itemSer, "XFRX", " ", conn); cctrCode = finCommon.getAcctDetrTtype(itemCode, itemSer, "XFRX", " ", conn);
acctCode = cctrCode.substring(0,cctrCode.indexOf(",")); acctCode = cctrCode.substring(0,cctrCode.indexOf(","));
...@@ -792,7 +790,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -792,7 +790,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
if (!nearExpLoc.trim().equalsIgnoreCase(locCodeTo.trim()) ) if (!nearExpLoc.trim().equalsIgnoreCase(locCodeTo.trim()) )
{ {
// update new location with + hold_qty // update new location with + hold_qty
/* sqlRel = "UPDATE STOCK SET HOLD_QTY = CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END + ? " sqlRel = "UPDATE STOCK SET HOLD_QTY = CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END + ? "
+ " WHERE ITEM_CODE = ? " + " WHERE ITEM_CODE = ? "
+ " AND SITE_CODE = ? " + " AND SITE_CODE = ? "
+ " AND LOC_CODE = ? " + " AND LOC_CODE = ? "
...@@ -812,14 +810,13 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -812,14 +810,13 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
pstmtHold = null; pstmtHold = null;
rsHold = null; rsHold = null;
*/
tranIdHold = ""; tranIdHold = "";
lineNoHold = 0; lineNoHold = 0;
//Changed by Rohan on 26-07-13 for disinct record //Changed by Rohan on 26-07-13 for disinct record
//sqlHold = "SELECT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, " //sqlHold = "SELECT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, "
sqlHold = "SELECT DISTINCT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, " /*lHold = "SELECT DISTINCT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, "
+ " D.ITEM_CODE AS ITEM_CODE, D.SITE_CODE AS SITE_CODE, " + " D.ITEM_CODE AS ITEM_CODE, D.SITE_CODE AS SITE_CODE, "
+ " D.LOC_CODE AS LOC_CODE, D.LOT_NO AS LOT_NO, D.LOT_SL AS LOT_SL ,D.REAS_CODE " //ADDED BY KUNAL ON 23/MAY/14 ADD REAS_CODE + " D.LOC_CODE AS LOC_CODE, D.LOT_NO AS LOT_NO, D.LOT_SL AS LOT_SL ,D.REAS_CODE " //ADDED BY KUNAL ON 23/MAY/14 ADD REAS_CODE
//Changed By Rohan on 18-07-13 for getting lock_code //Changed By Rohan on 18-07-13 for getting lock_code
...@@ -845,7 +842,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -845,7 +842,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
+ " AND ((T.LOT_NO = ? ) OR (T.LOT_NO IS NULL OR LENGTH(TRIM(T.LOT_NO)) = 0 ) ) " + " AND ((T.LOT_NO = ? ) OR (T.LOT_NO IS NULL OR LENGTH(TRIM(T.LOT_NO)) = 0 ) ) "
+ " AND ((T.LOT_SL = ? ) OR (T.LOT_SL IS NULL OR LENGTH(TRIM(T.LOT_SL)) = 0 ) ) " + " AND ((T.LOT_SL = ? ) OR (T.LOT_SL IS NULL OR LENGTH(TRIM(T.LOT_SL)) = 0 ) ) "
+ " AND D.HOLD_STATUS = 'H'" + " AND D.HOLD_STATUS = 'H'"
+ " AND H.CONFIRMED = 'Y' "; + " AND H.CONFIRMED = 'Y' ";*/
sqlHold="select * from inv_hold_rel_trace where item_code=? and site_code=? and loc_code=? and "
+ " lot_no=? and lot_sl=? and hold_qty>0";
pstmtHold = conn.prepareStatement(sqlHold); pstmtHold = conn.prepareStatement(sqlHold);
pstmtHold.setString(1,itemCode); pstmtHold.setString(1,itemCode);
pstmtHold.setString(2,siteCode); pstmtHold.setString(2,siteCode);
...@@ -854,7 +853,6 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -854,7 +853,6 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
pstmtHold.setString(5,lotSl); pstmtHold.setString(5,lotSl);
rsHold = pstmtHold.executeQuery(); rsHold = pstmtHold.executeQuery();
balQty = holdQuantity; balQty = holdQuantity;
String siteInvHold="",lotNoInvHold="",itemInvHold="";
while ( rsHold.next() ) while ( rsHold.next() )
{ {
/*//check whether there is a confirmed release hold for the same /*//check whether there is a confirmed release hold for the same
...@@ -876,38 +874,33 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -876,38 +874,33 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
pstmtRel.close(); pstmtRel.close();
pstmtRel = null; pstmtRel = null;
*/ */
tranIdHold = rsHold.getString("TRAN_ID");// added by Ashish Sonawane on 05-sep-12 //tranIdHold = rsHold.getString("TRAN_ID");// added by Ashish Sonawane on 05-sep-12
tranIdHold = rsHold.getString("ref_no");
//Changed By Rohan on 18-07-13 for getting lock_code //Changed By Rohan on 18-07-13 for getting lock_code
lockCode = checkNull(rsHold.getString("LOCK_CODE")); lockCode = checkNull(rsHold.getString("lock_code"));
//Changed by Rohan on 06-08-13 to get hold qty //Changed by Rohan on 06-08-13 to get hold qty
holdQty = rsHold.getDouble("HOLD_QTY"); holdQty = rsHold.getDouble("HOLD_QTY");
locCodeInvHold = checkNull(rsHold.getString("LOC_CODE")); locCodeInvHold = checkNull(rsHold.getString("LOC_CODE"));
lotSlInvHold = checkNull(rsHold.getString("LOT_SL")); lotSlInvHold = checkNull(rsHold.getString("LOT_SL"));
reasonCodeInvHold = checkNull(rsHold.getString("REAS_CODE")); //reasonCodeInvHold = checkNull(rsHold.getString("REAS_CODE"));
System.out.println("inv hold loc code="+locCodeInvHold+"@"+lotSlInvHold+"@"+reasonCodeInvHold); System.out.println("inv hold loc code="+locCodeInvHold+"@"+lotSlInvHold+"@"+reasonCodeInvHold);
System.out.println("invStatLocCodeTo"+invStatLocCodeTo+"locCodeTo"+locCodeTo); System.out.println("invStatLocCodeTo"+invStatLocCodeTo+"locCodeTo"+locCodeTo);
System.out.println("Current Lock Code"+lockCode+"quantity::"+quantity+"holdQty::"+holdQty); System.out.println("Current Lock Code"+lockCode+"quantity::"+quantity+"holdQty::"+holdQty);
siteInvHold= checkNull(rsHold.getString("SITE_CODE"));
itemInvHold= checkNull(rsHold.getString("ITEM_CODE"));
lotNoInvHold= checkNull(rsHold.getString("LOT_NO"));
//Changed by Rohan on 06-08-13 if partial qty move from pso to pso lacation.start //Changed by Rohan on 06-08-13 if partial qty move from pso to pso lacation.start
//if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim())) //if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim()))
//if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim()) || quantity < holdQty )
/*Commented by Manoj dtd 18/10/2014 //if(quantity < holdQty )
if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim()) || quantity < holdQty ) //{
{
System.out.println("-----Insert Block-----"); System.out.println("-----Insert Block-----");
//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE //Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE
//insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,conn); //insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,conn);
insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,locCodeFr,lotSl,quantity,lockCode,reasonCodeInvHold,conn); insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,locCodeFr,lotSl,quantity,lockCode,reasonCodeInvHold,conn);
System.out.println("@@@@ End of insertion..."); System.out.println("@@@@ End of insertion...");
} //}
else // else
{*/ // {
//Method changed by Manoj dtd 29/10/2014 to remove insertion in inv_hold_det table and insert/update in inv_hold_rel_trace table // System.out.println("-----Update Block-----");
insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,locCodeFr,lotSl,quantity,lockCode,reasonCodeInvHold,conn);
System.out.println("-----Update Block-----");
// changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold det.start // changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold det.start
/*sqlRel = "UPDATE INV_HOLD_DET SET LOC_CODE = ?, STATUS_DATE = ? " /*sqlRel = "UPDATE INV_HOLD_DET SET LOC_CODE = ?, STATUS_DATE = ? "
+ " WHERE TRAN_ID = ? AND LINE_NO = ?"; + " WHERE TRAN_ID = ? AND LINE_NO = ?";
...@@ -917,69 +910,62 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -917,69 +910,62 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
pstmtUpd.setString(3,rsHold.getString("TRAN_ID")); pstmtUpd.setString(3,rsHold.getString("TRAN_ID"));
pstmtUpd.setInt(4,rsHold.getInt("LINE_NO")); pstmtUpd.setInt(4,rsHold.getInt("LINE_NO"));
pstmtUpd.executeUpdate(); */ pstmtUpd.executeUpdate(); */
// sqlRel = "UPDATE INV_HOLD_DET SET LOC_CODE = ?, STATUS_DATE = ?, LOT_SL = ? "
if(locCodeInvHold.trim().length()>0 || lotSlInvHold.trim().length()>0) // + " WHERE TRAN_ID = ? AND LINE_NO = ?";
{ // pstmtUpd = conn.prepareStatement(sqlRel);
// pstmtUpd.setString(1,locCodeTo);
// pstmtUpd.setTimestamp(2,new java.sql.Timestamp( System.currentTimeMillis() ));
sqlRel = "UPDATE INV_HOLD_DET SET LOC_CODE = ?, STATUS_DATE = ?, LOT_SL = ? " // pstmtUpd.setString(3,lotSlTo);
+ " WHERE TRAN_ID = ? AND LINE_NO = ?"; // pstmtUpd.setString(4,rsHold.getString("TRAN_ID"));
pstmtUpd = conn.prepareStatement(sqlRel); // pstmtUpd.setInt(5,rsHold.getInt("LINE_NO"));
pstmtUpd.setString(1,locCodeTo); // pstmtUpd.executeUpdate();
pstmtUpd.setTimestamp(2,new java.sql.Timestamp( System.currentTimeMillis() ));
pstmtUpd.setString(3,lotSlTo); // 23/06/12 manoharan
pstmtUpd.setString(4,rsHold.getString("TRAN_ID")); // changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold det.end
pstmtUpd.setInt(5,rsHold.getInt("LINE_NO"));
pstmtUpd.executeUpdate(); // 23/06/12 manoharan
//tranIdHold = rsHold.getString("TRAN_ID"); //commented by Ashish Sonawane on 05-Sep-12 and moved to line no 421
// 23/06/12 manoharan // changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold_trace.start
// changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold det.end /*sqlRel = "UPDATE INV_HOLD_REL_TRACE SET LOC_CODE = ? "
+ " WHERE REF_NO = ? "
// 23/06/12 manoharan + " AND ITEM_CODE = ? "
//tranIdHold = rsHold.getString("TRAN_ID"); //commented by Ashish Sonawane on 05-Sep-12 and moved to line no 421 + " AND SITE_CODE = ? "
// changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold_trace.start + " AND LOC_CODE = ? "
/*sqlRel = "UPDATE INV_HOLD_REL_TRACE SET LOC_CODE = ? " + " AND LOT_NO = ? "
+ " WHERE REF_NO = ? " + " AND LOT_SL = ? " ;
+ " AND ITEM_CODE = ? " pstmtUpd = conn.prepareStatement(sqlRel);
+ " AND SITE_CODE = ? " pstmtUpd.setString(1,locCodeTo);
+ " AND LOC_CODE = ? " pstmtUpd.setString(2,tranIdHold);
+ " AND LOT_NO = ? " pstmtUpd.setString(3,itemCode);
+ " AND LOT_SL = ? " ; pstmtUpd.setString(4,siteCode);
pstmtUpd = conn.prepareStatement(sqlRel); pstmtUpd.setString(5,locCodeFr);
pstmtUpd.setString(1,locCodeTo); pstmtUpd.setString(6,lotNo);
pstmtUpd.setString(2,tranIdHold); pstmtUpd.setString(7,lotSl);
pstmtUpd.setString(3,itemCode); updCnt = pstmtUpd.executeUpdate();
pstmtUpd.setString(4,siteCode); System.out.println( "[" + updCnt + "] rows updated successfully in INV_HOLD_REL_TRACE" );
pstmtUpd.setString(5,locCodeFr); // end 23/06/12 manoharan */
pstmtUpd.setString(6,lotNo); // sqlRel = "UPDATE INV_HOLD_REL_TRACE SET LOC_CODE = ?, LOT_SL = ?"
pstmtUpd.setString(7,lotSl); // + " WHERE REF_NO = ? "
updCnt = pstmtUpd.executeUpdate(); // + " AND ITEM_CODE = ? "
System.out.println( "[" + updCnt + "] rows updated successfully in INV_HOLD_REL_TRACE" ); // + " AND SITE_CODE = ? "
// end 23/06/12 manoharan */ // + " AND LOC_CODE = ? "
sqlRel = "UPDATE INV_HOLD_REL_TRACE SET LOC_CODE = ?, LOT_SL = ?" // + " AND LOT_NO = ? "
+ " WHERE REF_NO = ? " // + " AND LOT_SL = ? " ;
+ " AND ITEM_CODE = ? " // pstmtUpd = conn.prepareStatement(sqlRel);
+ " AND SITE_CODE = ? " // pstmtUpd.setString(1,locCodeTo);
+ " AND LOC_CODE = ? " // pstmtUpd.setString(2,lotSlTo);
+ " AND LOT_NO = ? " // pstmtUpd.setString(3,tranIdHold);
+ " AND LOT_SL = ? " ; // pstmtUpd.setString(4,itemCode);
pstmtUpd = conn.prepareStatement(sqlRel); // pstmtUpd.setString(5,siteCode);
pstmtUpd.setString(1,locCodeTo); // pstmtUpd.setString(6,locCodeFr);
pstmtUpd.setString(2,lotSlTo); // pstmtUpd.setString(7,lotNo);
pstmtUpd.setString(3,tranIdHold); // pstmtUpd.setString(8,lotSl);
pstmtUpd.setString(4,itemCode); // updCnt = pstmtUpd.executeUpdate();
pstmtUpd.setString(5,siteCode); // System.out.println( "[" + updCnt + "] rows updated successfully in INV_HOLD_REL_TRACE" );
pstmtUpd.setString(6,locCodeFr); // end 23/06/12 manoharan */
pstmtUpd.setString(7,lotNo); // changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold_trace det.end
pstmtUpd.setString(8,lotSl); // end 23/06/12 manoharan
updCnt = pstmtUpd.executeUpdate(); // }
System.out.println( "[" + updCnt + "] rows updated successfully in INV_HOLD_REL_TRACE" );
// end 23/06/12 manoharan */
// changed by sankara on 06-07-13 fixing bug updated corret lot_sl in inv_hold_trace det.end
// end 23/06/12 manoharan
//}
}
} }
rsHold.close(); rsHold.close();
rsHold = null; rsHold = null;
...@@ -1120,8 +1106,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -1120,8 +1106,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE //Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE
//private void insertIntoInvHold(String itemCode ,String siteCode, String locCode ,String lotNo, String lotSl, String tranIdHold ,Connection conn) throws ITMException //private void insertIntoInvHold(String itemCode ,String siteCode, String locCode ,String lotNo, String lotSl, String tranIdHold ,Connection conn) throws ITMException
//change done by kunal on 31/may/14 reason code add in argumnet //change done by kunal on 31/may/14 reason code add in argumnet
//insertIntoInvHold(String itemCode ,String siteCode, String locCodeTo,String lotNo, String lotSlTo,String tranIdHold ,String locCodeFr,String lotSl ,double quantity,String lockCode,String reasonCodeInvHold,Connection conn); private void insertIntoInvHold(String itemCode ,String siteCode, String locCode ,String lotNo, String lotSl, String tranIdHold ,String locCodeFr,String lotSlFr,double holdQuantity,String lockCode,String reasonCode ,Connection conn) throws ITMException
private void insertIntoInvHold(String itemCode ,String siteCode, String locCode ,String lotNo, String lotSl ,String tranIdHold ,String locCodeFr,String lotSlFr,double holdQuantity,String lockCode,String reasonCode ,Connection conn) throws ITMException
{ {
PreparedStatement pstmtInsertInvHold =null; PreparedStatement pstmtInsertInvHold =null;
PreparedStatement pstmtMaxLine =null; PreparedStatement pstmtMaxLine =null;
...@@ -1135,8 +1120,28 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -1135,8 +1120,28 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
try { try {
sql ="select count(*) from INV_HOLD_REL_TRACE where REF_NO = ? and ITEM_CODE = ? and SITE_CODE = ? " String sqlMaxLine ="SELECT MAX(LINE_NO) FROM INV_HOLD_DET WHERE TRAN_ID =?";
+" and LOC_CODE = ? and LOT_NO = ? and LOT_SL = ? "; pstmtMaxLine = conn.prepareStatement(sqlMaxLine);
pstmtMaxLine.setString(1,tranIdHold);
rsMaxLine =pstmtMaxLine.executeQuery();
if(rsMaxLine.next())
{
maxLineNo =(rsMaxLine.getInt(1))+1;
System.out.println("line no to be inserted :" +maxLineNo);
}
else
{
maxLineNo =maxLineNo++;
}
ibase.utility.E12GenericUtility genericUtility = new ibase.utility.E12GenericUtility();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateTimeFormat());
Date sysDate = new Date();
String sysDateStr = sdf.format(sysDate);
sql ="select count(*) from inv_hold_det where tran_id = ? and item_code = ? and site_code = ? "
+" and loc_code = ? and lot_no = ? and lot_sl = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdHold); pstmt.setString(1,tranIdHold);
pstmt.setString(2, itemCode); pstmt.setString(2, itemCode);
...@@ -1147,15 +1152,142 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -1147,15 +1152,142 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
rs =pstmt.executeQuery(); rs =pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
count1 = rs.getInt(1); count = rs.getInt(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null ; pstmt = null ;
System.out.println("count1="+count1); //Checking for lotwise in inv_hold_det if record by manoj dtd 08/12/2014
if(count1 == 0) if(count==0)
{
sql="select count(*) from inv_hold_det where tran_id = ? and item_code = ? and site_code = ? and lot_no=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdHold);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, lotNo);
rs =pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null ;
}
//Checking for item wise in inv_hold_det if record by manoj dtd 08/12/2014
if(count==0)
{
sql="select count(*) from inv_hold_det where tran_id = ? and item_code = ? and site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdHold);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
rs =pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null ;
}
if(count > 0)//aaded by kunal on 22/may/14
{ {
sql ="select count(*) from INV_HOLD_REL_TRACE where REF_NO = ? and ITEM_CODE = ? and SITE_CODE = ? "
+" and LOC_CODE = ? and LOT_NO = ? and LOT_SL = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdHold);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
rs =pstmt.executeQuery();
if(rs.next())
{
count1 = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null ;
System.out.println("count1="+count1);
if(count1 > 0)
{
sql = " update inv_hold_rel_trace set hold_qty = hold_qty + ? where ref_no = ? and item_code = ? "
+" and site_code = ? and loc_code = ? and lot_no = ? and lot_sl = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setDouble( 1,holdQuantity );
pstmt.setString( 2, tranIdHold);
pstmt.setString( 3, itemCode );
pstmt.setString( 4, siteCode );
pstmt.setString( 5, locCode );
pstmt.setString( 6, lotNo);
pstmt.setString( 7, lotSl );
System.out.println("record updated::"+pstmt.executeUpdate());
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
else
{
tranId = generateTraceId("w_inv_hold_rel_trace",siteCode, conn);
sql = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, HOLD_QTY, LOCK_CODE ) " +
" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, tranId);
pstmt.setString( 2, itemCode );
pstmt.setString( 3, siteCode );
pstmt.setString( 4, locCode );
pstmt.setString( 5, lotNo);
pstmt.setString( 6, lotSl );
pstmt.setString( 7, tranIdHold);
pstmt.setDouble( 8,holdQuantity );
pstmt.setString( 9, lockCode );
pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
}
else
{
String sqlInsertInvHold = "INSERT INTO INV_HOLD_DET (TRAN_ID, LINE_NO, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, HOLD_STATUS, STATUS_DATE , SCH_REL_DATE , REAS_CODE ) " +
" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
pstmtInsertInvHold = conn.prepareStatement(sqlInsertInvHold);
pstmtInsertInvHold.setString(1, tranIdHold);
pstmtInsertInvHold.setInt(2, maxLineNo);
pstmtInsertInvHold.setString(3, itemCode);
pstmtInsertInvHold.setString(4, siteCode);
pstmtInsertInvHold.setString(5, locCode);
pstmtInsertInvHold.setString(6, lotNo);
pstmtInsertInvHold.setString(7, lotSl);
pstmtInsertInvHold.setString(8, "H");
pstmtInsertInvHold.setTimestamp(9, Timestamp.valueOf( sysDateStr));
pstmtInsertInvHold.setTimestamp(10, Timestamp.valueOf( sysDateStr));
pstmtInsertInvHold.setString(11, reasonCode);
int isInserted = pstmtInsertInvHold.executeUpdate();
System.out.println("@@@@ Hey Row inserted !!!!!!!! .....Total :["+isInserted+"]");
//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE.start
tranId = generateTraceId("w_inv_hold_rel_trace",siteCode, conn); tranId = generateTraceId("w_inv_hold_rel_trace",siteCode, conn);
sql = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, HOLD_QTY, LOCK_CODE ) " + sql = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, HOLD_QTY, LOCK_CODE ) " +
" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ; " VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
...@@ -1170,40 +1302,28 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -1170,40 +1302,28 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
pstmt.setDouble( 8,holdQuantity ); pstmt.setDouble( 8,holdQuantity );
pstmt.setString( 9, lockCode ); pstmt.setString( 9, lockCode );
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close();
pstmt=null; if(pstmt != null)
sql = "UPDATE STOCK SET HOLD_QTY = CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END + ? " {
+ " WHERE ITEM_CODE = ? " pstmt.close();
+ " AND SITE_CODE = ? " pstmt = null;
+ " AND LOC_CODE = ? " }
+ " AND LOT_NO = ? " }
+ " AND LOT_SL = ? "; //sql = " UPDATE INV_HOLD_REL_TRACE SET HOLD_QTY = HOLD_QTY - ? WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";
sql = " UPDATE INV_HOLD_REL_TRACE SET HOLD_QTY = HOLD_QTY - ? WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND LOCK_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//pstmt.setDouble(1,holdQuantity); //Commented by Ashish Sonawane on 01/SEP/12 as implication on stock due to PGRL location for partial qty putaway pstmt.setDouble( 1, holdQuantity);
pstmt.setDouble(1,holdQuantity); //Added by Ashish Sonawane on 01/SEP/12 as implication on stock due to PGRL location for partial qty putaway pstmt.setString( 2, itemCode );
pstmt.setString(2,itemCode); pstmt.setString( 3, siteCode );
pstmt.setString(3,siteCode); pstmt.setString( 4, locCodeFr );
pstmt.setString(4,locCode); pstmt.setString( 5, lotNo);
pstmt.setString(5,lotNo); pstmt.setString( 6, lotSlFr );
//pstmt.setString(6,lotSl);//Gulzar on 21/12/11 pstmt.setString( 7, lockCode );
pstmt.setString(6,lotSl);//Gulzar on 21/12/11
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); //Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE.end
}
sql = " UPDATE INV_HOLD_REL_TRACE SET HOLD_QTY = HOLD_QTY - ? WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND LOCK_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble( 1, holdQuantity);
pstmt.setString( 2, itemCode );
pstmt.setString( 3, siteCode );
pstmt.setString( 4, locCodeFr );
pstmt.setString( 5, lotNo);
pstmt.setString( 6, lotSlFr );
pstmt.setString( 7, lockCode );
pstmt.executeUpdate();
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -1261,7 +1381,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -1261,7 +1381,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
java.sql.Date effDate = null; java.sql.Date effDate = null;
java.sql.Timestamp currDate = null; java.sql.Timestamp currDate = null;
ibase.utility.E12GenericUtility genericUtility= new ibase.utility.E12GenericUtility(); ibase.utility.E12GenericUtility genericUtility = new ibase.utility.E12GenericUtility();
try try
{ {
...@@ -1454,8 +1574,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -1454,8 +1574,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
hashMap.put("lot_no",lotNoFr); hashMap.put("lot_no",lotNoFr);
hashMap.put("lot_sl",lotSlFr); hashMap.put("lot_sl",lotSlFr);
hashMap.put("alloc_qty",new Double(-1*quantity)); hashMap.put("alloc_qty",new Double(-1*quantity));
hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode")); hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId")); hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId"));
errString = invAllocTrace.updateInvallocTrace(hashMap, conn); errString = invAllocTrace.updateInvallocTrace(hashMap, conn);
System.out.println("updateInvallocTrace 1....."+errString); System.out.println("updateInvallocTrace 1....."+errString);
if ( errString != null && errString.trim().length() > 0 ) if ( errString != null && errString.trim().length() > 0 )
...@@ -1543,8 +1663,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -1543,8 +1663,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
hashMap.put("lot_no",lotNoTo); hashMap.put("lot_no",lotNoTo);
hashMap.put("lot_sl",lotSlTo); hashMap.put("lot_sl",lotSlTo);
hashMap.put("alloc_qty",new Double(quantity)); hashMap.put("alloc_qty",new Double(quantity));
hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode")); hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId")); hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId"));
errString = invAllocTrace.updateInvallocTrace(hashMap, conn); errString = invAllocTrace.updateInvallocTrace(hashMap, conn);
System.out.println("updateInvallocTrace 2....."+errString); System.out.println("updateInvallocTrace 2....."+errString);
if ( errString != null && errString.trim().length() > 0 ) if ( errString != null && errString.trim().length() > 0 )
...@@ -2498,8 +2618,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -2498,8 +2618,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
hashMap.put("lot_no",lotNoFr); hashMap.put("lot_no",lotNoFr);
hashMap.put("lot_sl",lotSlFr); hashMap.put("lot_sl",lotSlFr);
hashMap.put("alloc_qty",new Double(-1*quantity)); hashMap.put("alloc_qty",new Double(-1*quantity));
hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode")); hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId")); hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId"));
errString = invAllocTrace.updateInvallocTrace(hashMap, conn); errString = invAllocTrace.updateInvallocTrace(hashMap, conn);
System.out.println("updateInvallocTrace....."+errString); System.out.println("updateInvallocTrace....."+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -2590,8 +2710,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -2590,8 +2710,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
hashMap.put("lot_no",lotNoTo); hashMap.put("lot_no",lotNoTo);
hashMap.put("lot_sl",lotSlTo); hashMap.put("lot_sl",lotSlTo);
hashMap.put("alloc_qty",new Double(quantity)); hashMap.put("alloc_qty",new Double(quantity));
hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode")); hashMap.put("chg_user",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId")); hashMap.put("chg_term",new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams,"termId"));
errString = invAllocTrace.updateInvallocTrace(hashMap, conn); errString = invAllocTrace.updateInvallocTrace(hashMap, conn);
System.out.println("updateInvallocTrace 2....."+errString); System.out.println("updateInvallocTrace 2....."+errString);
if ( errString != null && errString.trim().length() > 0 ) 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