Skip to content

B
business-java
Commit 00450f03 authored by pjain's avatar pjain
Browse files
Options

changed by sankara on 05/09/14 update docktranconf and docktranpos and table steuctures 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96189 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7be8d4ef
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 42 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranConf.java
View file @ 00450f03
......@@ -36,7 +36,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
}*/
//Changed By Pragyan 09-MAY-14 to Take Local connection
//public String postSave(String domString, String tranId,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
public String confirm(String domString, String tranID,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
public String confirm(String domString, String docktranID,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
{
System.out.println( "Calling DockTranConfejb.........................................." );
......@@ -64,7 +64,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
StockUpdate stkUpdate = null;
String acctCodeDr = "",cctrCodeDr = "",packCode = "",unit = "",grade = "",remarks = "",
unitAlt = "",stagingLoc = "", batchNo = "",siteCodeMfg = "",packInstr = "",
suppCodeMfg = "",dimension = "",locCodeTo = "", tranId = "";
suppCodeMfg = "",dimension = "",locCodeTo = "", pickisstranId = "";
String updateSql = "";
boolean isError = false;
String empCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginEmpCode" );
......@@ -148,28 +148,28 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
rs.close(); rs = null;
pstmt.close(); pstmt = null;*/
sql = " SELECT TRAN_ID__ISS FROM DOCK_TRAN WHERE TRAN_ID = ? ";
sql = " SELECT PICK_TYPE FROM DOCK_TRAN WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, tranID);
pstmt.setString( 1, docktranID);
rs = pstmt.executeQuery();
if(rs.next())
{
tranId = rs.getString("TRAN_ID__ISS");
pickType = rs.getString("PICK_TYPE");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
sql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? WHERE TRAN_ID = ? ";
System.out.println("pickType:::::::::"+pickType);
/*sql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, locCodeTo);
pstmt.setString( 2, tranId);
pstmt.executeUpdate();
pstmt.close(); pstmt = null;
pstmt.close(); pstmt = null;*/
sql = "UPDATE DOCK_TRAN_DET SET LOC_CODE__TO = ? WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, locCodeTo);
pstmt.setString( 2, tranID);
pstmt.setString( 2, docktranID);
pstmt.executeUpdate();
pstmt.close(); pstmt = null;
......@@ -226,9 +226,9 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
+" AND R.LOC_CODE <> R.LOC_CODE__TO ";*/
sql = " SELECT D.SITE_CODE, D.TRAN_ID__ISS, DT.ITEM_CODE, DT.LOC_CODE, DT.LOT_NO, DT.LOT_SL, DT.QUANTITY, DT.NO_ART, DT.LOC_CODE__TO, DT.SALE_ORDER, DT.LINE_NO__SORD, " +
" DT.PICK_ORDER, DT.LINE_NO__PICK, DT.PICK_TYPE FROM DOCK_TRAN D, DOCK_TRAN_DET DT WHERE D.TRAN_ID = DT.TRAN_ID AND DT.TRAN_ID = ? ";
" DT.PICK_ORDER, DT.LINE_NO__PICK, D.PICK_TYPE FROM DOCK_TRAN D, DOCK_TRAN_DET DT WHERE D.TRAN_ID = DT.TRAN_ID AND DT.TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
pstmt.setString(1, docktranID);
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -246,9 +246,9 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
pickOrder = rs.getString( "PICK_ORDER" );
lineNo = rs.getInt( "LINE_NO__PICK" );
pickType = rs.getString( "PICK_TYPE" );
tranId = rs.getString( "TRAN_ID__ISS" );
pickisstranId = rs.getString( "TRAN_ID__ISS" );
System.out.println("pick type from hdr->> ["+pickType+"]");
System.out.println("tranIdissue->> ["+tranId+"]");
System.out.println("tranIdissue->> ["+pickisstranId+"]");
// 16/10/11 manoharan check whether allocation against sales order is there
// if allocation against sales order found change allocation to point to loc_code__to
// and deallocate the same for loc_code in stock
......@@ -315,7 +315,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
updateRowMap.put("cctr_code_inv",cctrCodeDr);
updateRowMap.put("rate",Double.toString(stkRate));
updateRowMap.put("gross_rate",Double.toString(stkGrossRate));
updateRowMap.put("tran_id", tranId );
updateRowMap.put("tran_id", pickisstranId );
// 17/10/11 manoharan
updateRowMap.put("line_no", "" + lineNo );
// end 17/10/11 manoharan
......@@ -388,7 +388,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
strAllocate = new HashMap();
strAllocate.put("tran_date",tranDate);
strAllocate.put("ref_ser","PICISS");
strAllocate.put("ref_id",tranId);
strAllocate.put("ref_id",pickisstranId);
strAllocate.put("ref_line", "" + lineNo);
strAllocate.put("site_code",siteCode);
strAllocate.put("item_code",itemCode);
......@@ -755,7 +755,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, locCodeTo);
pstmtUpd.setString(2, tranId);
pstmtUpd.setString(2, pickisstranId);
pstmtUpd.setInt(3, lineNo);
updCnt = pstmtUpd.executeUpdate();
}
......@@ -773,7 +773,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
+ " WHERE TRAN_ID = ? ";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, tranId);
pstmtUpd.setString(1, pickisstranId);
updCnt = pstmtUpd.executeUpdate();
pstmtUpd.close();
......
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ 00450f03
......@@ -58,7 +58,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
java.sql.Timestamp currDate = new java.sql.Timestamp( System.currentTimeMillis() );
StockUpdate stkUpdate = null;
String suppCodeMfg = "",dimension = "",locCodeTo = "", chguser = "",chgdate = "",chgterm = "",
employeeCode = "",conmfirmed = "",waveId = "",tranIdissue = "",tranID = "";
employeeCode = "",conmfirmed = "",waveId = "",tranIdissue = "",docktranID = "";
String updateSql = "";
String chgTerm ="";
boolean isError = false;
......@@ -106,10 +106,17 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
sql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, locCodeTo);
pstmt.setString( 2, tranId);
pstmt.executeUpdate();
pstmt.close(); pstmt = null;
tranID = generateTranId( "w_dock_tran",siteCode,conn );
docktranID = generateTranId( "w_dock_tran",siteCode,conn );
System.out.println("tranID:"+tranID);
System.out.println("generatetranID:"+docktranID);
/* sql = " SELECT R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, R.LOC_CODE LOC_CODE, "
+ " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) AS QUANTITY, R.NO_ART NO_ART, "
......@@ -173,19 +180,20 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
if(isRecordexist == false)
{
updateSql = " INSERT INTO DOCK_TRAN (TRAN_ID, SITE_CODE, PALLET_NO, TRAN_ID__ISS, EMP_CODE , " +
" PTCN, WAVE_ID, CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) ";
" PTCN, WAVE_ID,PICK_TYPE,CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) ";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, tranID);
pstmtUpd.setString(1, docktranID);
pstmtUpd.setString(2, siteCode);
pstmtUpd.setString(3, palletNo);
pstmtUpd.setString(4, tranIdissue);
pstmtUpd.setString(5, employeeCode);
pstmtUpd.setString(6, ptcn);
pstmtUpd.setString(7, waveId);
pstmtUpd.setTimestamp(8,currDate);
pstmtUpd.setString(9, chguser);
pstmtUpd.setString(10, chgTerm);
pstmtUpd.setString(8, pickType);
pstmtUpd.setTimestamp(9,currDate);
pstmtUpd.setString(10, chguser);
pstmtUpd.setString(11, chgTerm);
updCnt = pstmtUpd.executeUpdate();
if(updCnt > 0)
{
......@@ -195,26 +203,26 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
pstmtUpd.close();pstmtUpd = null;
}
updateSql = " INSERT INTO DOCK_TRAN_DET ( TRAN_ID, LINE_NO,LINE_NO__ISS,PICK_ORDER,LINE_NO__PICK,PICK_TYPE,ITEM_CODE,LOC_CODE,LOT_NO,LOT_SL,NO_ART,QUANTITY," +
" LOC_CODE__TO,LOC_CODE__SYS,SALE_ORDER,LINE_NO__SORD) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
updateSql = " INSERT INTO DOCK_TRAN_DET ( TRAN_ID, LINE_NO,LINE_NO__ISS,PICK_ORDER,LINE_NO__PICK,ITEM_CODE,LOC_CODE,LOT_NO,LOT_SL,NO_ART,QUANTITY," +
" LOC_CODE__TO,LOC_CODE__SYS,SALE_ORDER,LINE_NO__SORD) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, tranID);
pstmtUpd.setString(1, docktranID);
pstmtUpd.setInt(2, lineNumber);
pstmtUpd.setInt(3, lineNo);
pstmtUpd.setString(4, pickOrder);
pstmtUpd.setInt(5, lineNo);
pstmtUpd.setString(6, pickType);
pstmtUpd.setString(7, itemCode);
pstmtUpd.setString(8, locCode);
pstmtUpd.setString(9, lotNo);
pstmtUpd.setString(10, lotSl);
pstmtUpd.setDouble(11, noArt);
pstmtUpd.setDouble(12, quantity);
pstmtUpd.setString(13, locCodeTo);
pstmtUpd.setString(14, locCodeSys);
pstmtUpd.setString(15, saleOrder);
pstmtUpd.setString(16, lineNoSord);
//pstmtUpd.setString(6, pickType);
pstmtUpd.setString(6, itemCode);
pstmtUpd.setString(7, locCode);
pstmtUpd.setString(8, lotNo);
pstmtUpd.setString(9, lotSl);
pstmtUpd.setDouble(10, noArt);
pstmtUpd.setDouble(11, quantity);
pstmtUpd.setString(12, locCodeTo);
pstmtUpd.setString(13, locCodeSys);
pstmtUpd.setString(14, saleOrder);
pstmtUpd.setString(15, lineNoSord);
updCnt = pstmtUpd.executeUpdate();
if(updCnt > 0)
{
......@@ -253,7 +261,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
InitialContext ctx = new InitialContext(p);
DockTranConfLocal docktranConfLocal = null;
docktranConfLocal = (DockTranConfLocal)ctx.lookup("ibase/DockTranConf/local");
errString = docktranConfLocal.confirm(domString,tranID,editFlag,xtraParams,conn );
errString = docktranConfLocal.confirm(domString,docktranID,editFlag,xtraParams,conn );
System.out.println(" ************ errString ******** ["+errString+"]");
//errString = dockconf.confirm(domString,tranID,editFlag,xtraParams,conn );
......@@ -263,7 +271,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, "Y");
pstmtUpd.setTimestamp(2,currDate);
pstmtUpd.setString(3, tranID);
pstmtUpd.setString(3, docktranID);
updCnt = pstmtUpd.executeUpdate();
if(updCnt > 0)
{
......
webitm-wms/module-resource/sql/update.sql
View file @ 00450f03
......@@ -49372,7 +49372,44 @@ function fn_wave_status(SI_WAVE_ID IN CHAR)
--changed by sankara on 03/09/14 update alter sql.
ALTER TABLE CARTON_MASTER ADD CLOSEOUT_DATE DATE;
commit;
CREATE TABLE DOCK_TRAN
(
TRAN_ID VARCHAR2(10) NOT NULL,
SITE_CODE CHAR(5),
CONFIRMED CHAR(1),
CONF_DATE DATE,
PALLET_NO VARCHAR2(25),
TRAN_ID__ISS CHAR(10),
EMP_CODE CHAR(10),
PTCN CHAR(10),
WAVE_ID VARCHAR2(12),
PICK_TYPE CHAR(1),
CHG_DATE DATE,
CHG_USER CHAR(10),
CHG_TERM CHAR(15)
) ;
ALTER TABLE DOCK_TRAN ADD ( CONSTRAINT PK_A_DOCK_TRAN PRIMARY KEY ( "TRAN_ID" )) ;
CREATE TABLE DOCK_TRAN_DET
(
TRAN_ID VARCHAR2(10) NOT NULL,
LINE_NO NUMBER(3,0) NOT NULL,
LINE_NO__ISS NUMBER(3,0),
PICK_ORDER CHAR(10),
LINE_NO__PICK NUMBER(3,0),
ITEM_CODE CHAR(10),
LOC_CODE CHAR(8),
LOT_NO CHAR(15),
LOT_SL CHAR(15),
NO_ART NUMBER(6,0),
QUANTITY NUMBER(14,3),
LOC_CODE__TO CHAR(8),
LOC_CODE__SYS CHAR(8),
SALE_ORDER CHAR(10),
LINE_NO__SORD NUMBER(3,0)
) ;
ALTER TABLE DOCK_TRAN_DET ADD ( CONSTRAINT PK_A_DOCKTRANDET PRIMARY KEY ( TRAN_ID, LINE_NO )) ;
commit;
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