Commit 7aa1b276 authored by dpawar's avatar dpawar

changes doen for one scanning pycn whole transaction get compleated


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98248 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 36578682
...@@ -70,6 +70,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -70,6 +70,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
java.util.Date confDate = new java.util.Date(); java.util.Date confDate = new java.util.Date();
DockTranConf dockconf = new DockTranConf(); DockTranConf dockconf = new DockTranConf();
ArrayList<String> pickIssTranIdList = new ArrayList<String>(); //Changed by Sneha on 08-07-2015
/* Connection conn1 = null; /* Connection conn1 = null;
ConnDriver connDriver = null;*/ ConnDriver connDriver = null;*/
//Changed By Pragyan on 06/12/14 To calculate no of article on dock tran //Changed By Pragyan on 06/12/14 To calculate no of article on dock tran
...@@ -104,9 +105,17 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -104,9 +105,17 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
pstmt.setString( 2, "N"); pstmt.setString( 2, "N");
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) //if(rs.next())
//Changed by Sneha on 08/07/15 [Start]
while(rs.next())
//Changed by Sneha on 08/07/15 [End]
{ {
tranId = rs.getString("tran_id")==null?"":rs.getString("tran_id"); tranId = rs.getString("tran_id")==null?"":rs.getString("tran_id");
//Changed by Sneha on 08/07/15 [Start]
pickIssTranIdList.add(tranId);
//Changed by Sneha on 08/07/15 [End]
pickType = rs.getString("pick_type")==null?"":rs.getString("pick_type"); pickType = rs.getString("pick_type")==null?"":rs.getString("pick_type");
pickOrder = rs.getString("pick_order")==null?"":rs.getString("pick_order"); pickOrder = rs.getString("pick_order")==null?"":rs.getString("pick_order");
System.out.println("pick order and pick type---- ["+palletNo+"] and pickType is ----["+pickType+"]"); System.out.println("pick order and pick type---- ["+palletNo+"] and pickType is ----["+pickType+"]");
...@@ -114,10 +123,20 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -114,10 +123,20 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
//Changed by Sneha on 08/07/15 [Start]
for(String tranId1 : pickIssTranIdList)
{
//Changed by Sneha on 08/07/15 [End]
isRecordexist = false;
sql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? WHERE TRAN_ID = ? "; sql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, locCodeTo); pstmt.setString( 1, locCodeTo);
pstmt.setString( 2, tranId); //pstmt.setString( 2, tranId);
//Changed by Sneha on 08/07/15 [Start]
pstmt.setString( 2, tranId1);
//Changed by Sneha on 08/07/15 [End]
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
...@@ -154,7 +173,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -154,7 +173,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
" AND ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) > 0 "+ " AND ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) > 0 "+
" AND R.LOC_CODE <> R.LOC_CODE__TO "; " AND R.LOC_CODE <> R.LOC_CODE__TO ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); //pstmt.setString(1, tranId);
//Changed by Sneha on 08/07/15 [Start]
pstmt.setString(1, tranId1);
//Changed by Sneha on 08/07/15 [End]
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
System.out.println("isRecordexist::"+isRecordexist); System.out.println("isRecordexist::"+isRecordexist);
while(rs.next()) while(rs.next())
...@@ -205,8 +228,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -205,8 +228,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
System.out.println("noArt after clc:"+noArt); System.out.println("noArt after clc:"+noArt);
//Changed By Pragyan on 06/12/14 To calculate no of article on dock tran.end //Changed By Pragyan on 06/12/14 To calculate no of article on dock tran.end
System.out.println("isRecordexist :::::::::: " + isRecordexist);
if(isRecordexist == false) if(isRecordexist == false)
{ {
updateSql = " INSERT INTO DOCK_TRAN (TRAN_ID, SITE_CODE, PALLET_NO, TRAN_ID__ISS, EMP_CODE , " + updateSql = " INSERT INTO DOCK_TRAN (TRAN_ID, SITE_CODE, PALLET_NO, TRAN_ID__ISS, EMP_CODE , " +
" PTCN, WAVE_ID,PICK_TYPE,CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) "; " PTCN, WAVE_ID,PICK_TYPE,CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) ";
...@@ -257,7 +283,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -257,7 +283,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
System.out.println("record inserted in dock_tran_det["+updCnt+"]"); System.out.println("record inserted in dock_tran_det["+updCnt+"]");
} }
pstmtUpd.close();pstmtUpd = null; pstmtUpd.close();pstmtUpd = null;
//Changed by Sneha on 09/07/15 [Start]
isRecordexist = true; isRecordexist = true;
//Changed by Sneha on 09/07/15 [End]
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
...@@ -283,7 +311,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -283,7 +311,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
} }
System.out.println("Changed By 02/05/13 Pragyan sordalloc inserted updCnt [" + updCnt + "]"); System.out.println("Changed By 02/05/13 Pragyan sordalloc inserted updCnt [" + updCnt + "]");
pstmtUpd.close();pstmtUpd = null; */ pstmtUpd.close();pstmtUpd = null; */
//conn.commit();
System.out.println("commit successfully..............");
AppConnectParm appConnect = new AppConnectParm(); AppConnectParm appConnect = new AppConnectParm();
Properties p = appConnect.getProperty(); Properties p = appConnect.getProperty();
InitialContext ctx = new InitialContext(p); InitialContext ctx = new InitialContext(p);
...@@ -307,6 +336,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -307,6 +336,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
} }
pstmtUpd.close();pstmtUpd = null; pstmtUpd.close();pstmtUpd = null;
} }
//Changed by Sneha on 08/07/15 [Start]
}
//Changed by Sneha on 08/07/15 [End]
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -556,4 +590,3 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -556,4 +590,3 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
} }
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