Skip to content

B
business-java
Commit 42d7b638 authored by smane's avatar smane
Browse files
Options

Add REF_LINE column in inv_hold_rel_trace table for Hold Inventory (W15DSUN008) 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98494 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 79a151eb
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 17 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/InvHoldConf.java
View file @ 42d7b638
......@@ -56,6 +56,7 @@ public class InvHoldConf extends ActionHandlerEJB implements InvHoldConfLocal ,I
boolean isConn= true;
try
{
conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);
connDriver = null;
......@@ -109,7 +110,8 @@ public class InvHoldConf extends ActionHandlerEJB implements InvHoldConfLocal ,I
String sqlHoldDet = null;
String sqlNoSl = null;
String lockCode = null;
String lineNo="";
int lineNoIn=0;
double holdQty = 0.0;
double qtyPerArt = 0.0;
double stockQty = 0.0;
......@@ -231,10 +233,12 @@ public class InvHoldConf extends ActionHandlerEJB implements InvHoldConfLocal ,I
sqlSelStck = "SELECT QUANTITY, QTY_PER_ART, HOLD_QTY FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? " ;
//pSelStck = conn.prepareStatement( sqlSelStck );by chandrashekar on 17-11-14
sqlInsert = " 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 ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
//sqlInsert = " 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 ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ; //comment added by sagar on 23/07/15
sqlInsert = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, HOLD_QTY, LOCK_CODE, REF_LINE ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ; // REF_LINE added by sagar on 23/07/15
//pstmtInsert = conn.prepareStatement(sqlInsert);by chandrashekar on 17-11-14
sqlHoldDet = "SELECT ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, LINE_NO_SL FROM INV_HOLD_DET WHERE TRAN_ID = ?" ;
//sqlHoldDet = "SELECT ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, LINE_NO_SL FROM INV_HOLD_DET WHERE TRAN_ID = ?" ; // comment added by sagar on 23/07/15
sqlHoldDet = "SELECT ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, LINE_NO_SL, LINE_NO FROM INV_HOLD_DET WHERE TRAN_ID = ?" ; // LINE_NO added by sagar on 23/07/15
pHoldDet = conn.prepareStatement(sqlHoldDet);
pHoldDet.setString(1,tranId);
rsHoldDet = pHoldDet.executeQuery();
......@@ -248,8 +252,16 @@ public class InvHoldConf extends ActionHandlerEJB implements InvHoldConfLocal ,I
lotNo = checkNull(rsHoldDet.getString("LOT_NO"));
lotSl = checkNull(rsHoldDet.getString("LOT_SL"));
lineNoSl = checkNull(rsHoldDet.getString("LINE_NO_SL"));
lineNo = checkNull(rsHoldDet.getString("LINE_NO"));
System.out.println("itemCode : "+itemCode);
System.out.println("lotNo : "+lotNo);
System.out.println("lineNo : "+lineNo);
if(lineNo !=null && lineNo.trim().length() > 0) // condition added by sagar on 23/07/15
{
lineNoIn= Integer.parseInt(lineNo.trim());
}
System.out.println("lineNoIn:"+lineNoIn);
if(lockLevel != null && "I".equalsIgnoreCase(lockLevel))
{
......@@ -345,6 +357,7 @@ public class InvHoldConf extends ActionHandlerEJB implements InvHoldConfLocal ,I
pstmtInsert.setString( 7, tranId);
pstmtInsert.setDouble( 8,qtyPerArt );
pstmtInsert.setString( 9, lockCode );
pstmtInsert.setInt( 10, lineNoIn );
pstmtInsert.executeUpdate();
if(pstmtInsert != null)
......@@ -484,6 +497,7 @@ public class InvHoldConf extends ActionHandlerEJB implements InvHoldConfLocal ,I
pstmtInsert.setString( 7, tranId );
pstmtInsert.setDouble( 8, stockQty );
pstmtInsert.setString( 9, lockCode );
pstmtInsert.setInt( 10, lineNoIn );
pstmtInsert.executeUpdate();
if(pstmtInsert != null)
{
......
webitm-dis/ibase/webitm/ejb/dis/adv/InvHoldRelConf.java
View file @ 42d7b638
......@@ -41,6 +41,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
}
public void ejbPassivate(){
}
public void setSessionContext(SessionContext se){
......@@ -94,7 +95,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
ITMDBAccessEJB itmDBAccessEJB = null;
String errString = null;
int upd = 0;
int lineNo= 0;
//changed by Dharmesh on 12-08-2011 [WM1ESUN004].start
String itemCode = null;
......@@ -146,7 +147,6 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
//changed by Dharmesh on 12-08-2011 [WM1ESUN004].end
try
{
itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -233,15 +233,19 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
sqlSelTrace = "SELECT SUM( case when HOLD_QTY is null then 0 else HOLD_QTY end ) AS HOLD_QTY_TRACE, SUM( case when REL_QTY is null then 0 else REL_QTY end ) AS REL_QTY_TRACE FROM INV_HOLD_REL_TRACE WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? " ;
pSelTrace = conn.prepareStatement(sqlSelTrace);
sqlInsert = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, REL_QTY, LOCK_CODE ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
//sqlInsert = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, REL_QTY, LOCK_CODE ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ; // comment added by sagar on 23/07/15
sqlInsert = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, REL_QTY, LOCK_CODE, REF_LINE ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ; // REF_LINE added by sagar on 23/07/15
pInsert = conn.prepareStatement(sqlInsert);
// 14/04/14 manoharan hold_status added it should not be R
sqlHoldDet = "SELECT ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, LINE_NO_SL, HOLD_STATUS FROM INV_HOLD_DET WHERE TRAN_ID = ? AND LINE_NO = ?" ;
pHoldDet = conn.prepareStatement(sqlHoldDet);
sqlDetail = " SELECT HOLDDET.TRAN_ID__HOLD, HOLDDET.LINE_NO__HOLD, IHOLD.LOCK_CODE "+
/*sqlDetail = " SELECT HOLDDET.TRAN_ID__HOLD, HOLDDET.LINE_NO__HOLD, IHOLD.LOCK_CODE "+
" FROM INV_HOLD_REL_DET HOLDDET, INV_HOLD IHOLD "+
" WHERE HOLDDET.TRAN_ID__HOLD = IHOLD.TRAN_ID AND HOLDDET.TRAN_ID = ? ";*/ // comment added by sagar on 27/07/15
sqlDetail = " SELECT HOLDDET.TRAN_ID__HOLD, HOLDDET.LINE_NO__HOLD, IHOLD.LOCK_CODE, HOLDDET.LINE_NO "+
" FROM INV_HOLD_REL_DET HOLDDET, INV_HOLD IHOLD "+
" WHERE HOLDDET.TRAN_ID__HOLD = IHOLD.TRAN_ID AND HOLDDET.TRAN_ID = ? ";
" WHERE HOLDDET.TRAN_ID__HOLD = IHOLD.TRAN_ID AND HOLDDET.TRAN_ID = ? "; // LINE_NO added by sagar on 27/07/15
pDetail = conn.prepareStatement( sqlDetail );
pDetail.setString( 1,tranId );
rsDetail = pDetail.executeQuery();
......@@ -252,10 +256,11 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
tranIdHold = rsDetail.getString("TRAN_ID__HOLD");
lineNoHold = rsDetail.getInt("LINE_NO__HOLD");
lockCode = rsDetail.getString("LOCK_CODE");
lineNo = rsDetail.getInt("LINE_NO");
System.out.println("tranIdHold =[" + tranIdHold + "]");
System.out.println("lineNoHold =[" + lineNoHold + "]");
System.out.println("lockCode =[" + lockCode + "]");
System.out.println(">>>>Release Line No:"+ lineNo);
pHoldDet.setString( 1,tranIdHold );
pHoldDet.setInt( 2,lineNoHold );
......@@ -350,7 +355,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
pUpdate.executeUpdate();
pUpdate.clearParameters();
}
System.out.println(">>>>In if line_no_sl is not null then lineNo:"+ lineNo);
pInsert.setString( 1, tranIdTrace);
pInsert.setString( 2, itemCode );
pInsert.setString( 3, siteCode );
......@@ -360,6 +365,8 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
pInsert.setString( 7, tranId );
pInsert.setDouble( 8, (-qtyPerArt) );
pInsert.setString( 9, lockCode );
pInsert.setInt( 10, lineNo );
pInsert.executeUpdate();
pInsert.clearParameters();
......@@ -508,7 +515,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
pUpdate.executeUpdate();
pUpdate.clearParameters();
}
System.out.println(">>>>In else line_no_sl is null then lineNo:"+ lineNo);
pInsert.setString( 1, tranIdTrace );
pInsert.setString( 2, itemCode );
pInsert.setString( 3, siteCode );
......@@ -518,6 +525,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
pInsert.setString( 7, tranId );
pInsert.setDouble( 8, (-holdQtyStock) );
pInsert.setString( 9, lockCode );
pInsert.setInt( 10, lineNo );
pInsert.executeUpdate();
pInsert.clearParameters();
}
......
webitm-dis/ibase/webitm/ejb/dis/adv/StockTransferConf.java
View file @ 42d7b638
......@@ -789,7 +789,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
// also reduce the hold_qty for old loc_code
// This utility methods to update old and new location should be in
// a separate probably in stockupdate so that we can call the same from various places
System.out.println(">>>>>>Before StockUpdtHoldItems:");
StockUpdtHoldItems(reasonCodeInvHold,holdQuantity,quantity,itemCode,siteCode,locCodeFr,lotNo,lotSl,locCodeTo,lotSlTo,conn);
System.out.println(">>>>>>After StockUpdtHoldItems:");
// end 16/10/11 manoharan
}
......@@ -948,6 +950,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
DistCommon dComm=new DistCommon();
try
{
System.out.println(">>>>In StockUpdtHoldItems");
String nearExpLoc = dComm.getDisparams("999999","NEAREXP_LOC",conn);
String partialGrlLoc = dComm.getDisparams("999999","PGRL_INVSTAT",conn);
if (holdQuantity > 0)
......@@ -1090,6 +1093,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
System.out.println("-----Insert Block-----");
//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE
//insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,conn);
System.out.println(">>>>>>>>>>Before calling insertIntoInvHold:");
insertIntoInvHold(itemCode,siteCode,locCodeTo,lotNo,lotSlTo,tranIdHold,locCodeFr,lotSl,quantity,lockCode,reasonCodeInvHold,conn);
System.out.println("@@@@ End of insertion...");
//}
......@@ -1188,12 +1192,16 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
PreparedStatement pstmt = null;
String sql = "";
String tranId = "";
int lineNoIn=0;
//Changed by Rohan on 17-07-13 for updating INV_HOLD_REL_TRACE prepared statement and result set.end
int maxLineNo=0,count = 0,count1 = 0;
double holdQty=0;
boolean isAddInvHoldDet=false;
try {
System.out.println(">>>>In insertIntoInvHold:");
String sqlMaxLine ="SELECT MAX(LINE_NO) FROM INV_HOLD_DET WHERE TRAN_ID =?";
pstmtMaxLine = conn.prepareStatement(sqlMaxLine);
pstmtMaxLine.setString(1,tranIdHold);
......@@ -1237,6 +1245,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
if(!isitemHold)
{
System.out.println(">>>>isitemHold:"+isitemHold);
sql="select line_no from inv_hold_det where tran_id = ? and item_code = ? and site_code = ? "
+" and lot_no = ? and lot_sl is null and loc_code is null and case when hold_status is null then 'H' else hold_status end ='H' ";
pstmt = conn.prepareStatement(sql);
......@@ -1257,6 +1266,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
}
if(!isitemLotHold)
{
System.out.println(">>>>isitemLotHold:"+isitemLotHold);
sql="select line_no from inv_hold_det where tran_id = ? and item_code = ? and site_code = ? "
+" and loc_code = ? and lot_no = ? and lot_sl=? and case when hold_status is null then 'H' else hold_status end ='H' ";
pstmt = conn.prepareStatement(sql);
......@@ -1279,6 +1289,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
}
if(isuniqueHold)
{
System.out.println(">>>>isuniqueHold:"+isuniqueHold);
/*sql="select hold_qty from stock where site_code=? and item_code=? and lot_no=? and lot_sl=? and loc_code=? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
......@@ -1333,6 +1344,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
rs=null;
pstmt.close();
pstmt=null;
System.out.println(">>>>isuniqueHold true condition count:"+ count);
if(count==0)
{
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 ) " +
......@@ -1354,6 +1366,12 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
int isInserted = pstmtInsertInvHold.executeUpdate();
pstmtInsertInvHold.close();
pstmtInsertInvHold=null;
System.out.println(">>>isInserted :"+ isInserted);
if(isInserted > 0) //condition added by sagar on 20/08/15
{
isAddInvHoldDet= true;
}
}
sql="select hold_qty from stock where site_code=? and item_code=? and lot_no=? and lot_sl=? and loc_code=? ";
pstmt=conn.prepareStatement(sql);
......@@ -1577,7 +1595,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
rs = null;
pstmt.close();
pstmt = null ;
System.out.println("count1="+count1);
System.out.println(">>>inv_hold_rel_trace count1="+count1);
if(count1 > 0)
{
sql = " update inv_hold_rel_trace set hold_qty = hold_qty + ? where ref_no = ? and item_code = ? "
......@@ -1601,9 +1619,24 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
}
else
{
System.out.println(">>>>Check isAddInvHoldDet:"+isAddInvHoldDet);
System.out.println(">>>>maxLineNo:"+maxLineNo);
if(isAddInvHoldDet) // condition added by sagar on 24/07/15
{
lineNoIn= maxLineNo;
}
else
{
if(lineNo !=null && lineNo.trim().length() > 0)
{
lineNoIn= Integer.parseInt(lineNo.trim());
}
}
System.out.println(">>>>lineNo for INV_HOLD_REL_TRACE(REF_LINE):"+ lineNoIn);
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 ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
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, REF_LINE ) " +
" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ; // REF_LINE added by sagar on 24/07/15
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, tranId);
pstmt.setString( 2, itemCode );
......@@ -1614,6 +1647,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
pstmt.setString( 7, tranIdHold);
pstmt.setDouble( 8,holdQuantity );
pstmt.setString( 9, lockCode );
pstmt.setInt(10, lineNoIn);
pstmt.executeUpdate();
if(pstmt != null)
......
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