Commit af28eff1 authored by rbhogale's avatar rbhogale

Changed by Rohan on 30-30-13 for consolidation process manually


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92905 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 02982cd3
...@@ -1175,6 +1175,25 @@ public class ConsolidatToDoc { ...@@ -1175,6 +1175,25 @@ public class ConsolidatToDoc {
errString = ""; errString = "";
return errString; return errString;
} }
//Changed by Rohan on 2=30-03-13 to delete sordalloc where stock alloc qty is zero.start
System.out.println("isError::"+isError+"errString[::"+errString+"]");
if(!isError && ("".equalsIgnoreCase(errString)|| errString == null) && errString.trim().length() == 0)
{
System.out.println("Delete records:::::::");
sql = " DELETE FROM SORDALLOC WHERE QTY_ALLOC = 0 ";
pstmt = conn.prepareStatement(sql);
int updCnt = pstmt.executeUpdate();
if( updCnt > 0 )
{
System.out.println(" No of record deleted successfully "+updCnt);
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
//Changed by Rohan on 2=30-03-13 to delete sordalloc where stock alloc qty is zero.end
} }
...@@ -1539,8 +1558,9 @@ public class ConsolidatToDoc { ...@@ -1539,8 +1558,9 @@ public class ConsolidatToDoc {
return isConfirmed; return isConfirmed;
} }
//Chnaged by Rohan on 30-03-13 to change modifier to public to call from ConsolidatToDocPrc.java
private boolean isShipmentExist(String despId , Connection conn)throws Exception //private boolean isShipmentExist(String despId , Connection conn)throws Exception
public boolean isShipmentExist(String despId , Connection conn)throws Exception
{ {
String sql = ""; String sql = "";
boolean isDespExist = false; boolean isDespExist = false;
......
...@@ -3,18 +3,34 @@ package ibase.webitm.ejb.wms; ...@@ -3,18 +3,34 @@ package ibase.webitm.ejb.wms;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB; import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.dis.DistCommon; //Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc
//import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.*; //Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
import java.util.*; //import java.sql.BatchUpdateException;
import java.text.*; import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.HashMap;
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
import java.sql.PreparedStatement;
//import java.sql.SQLException;
//import java.sql.Timestamp;
//import java.text.SimpleDateFormat;
//import java.util.ArrayList;
//import java.util.HashMap;
//import java.util.Iterator;
//import java.util.Set;
*/
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.end
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@javax.ejb.Stateless @javax.ejb.Stateless
public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrcLocal, ConsolidatToDocPrcRemote{ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrcLocal, ConsolidatToDocPrcRemote{
...@@ -64,6 +80,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -64,6 +80,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException public String process(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException
{ {
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
String waveId = "", pickOrder = "", siteCode = "", itemCode = "", locCode = "", ptcn = "",locCodeTo=""; String waveId = "", pickOrder = "", siteCode = "", itemCode = "", locCode = "", ptcn = "",locCodeTo="";
String lotNo = "", lotSl = "", saleOrder = "", despId = ""; String lotNo = "", lotSl = "", saleOrder = "", despId = "";
String sql = "", sql1 = "",sqlOrd="", partNo = "", siteCodeMfg = "", packCode = "", packInstr = ""; String sql = "", sql1 = "",sqlOrd="", partNo = "", siteCodeMfg = "", packCode = "", packInstr = "";
...@@ -101,7 +119,22 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -101,7 +119,22 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
Timestamp mfgDate = null, expDate = null, retestDate = null; Timestamp mfgDate = null, expDate = null, retestDate = null;
DistCommon disCommon = new DistCommon(); DistCommon disCommon = new DistCommon();
*/
String ptcn = "",errString = "",sql = "";
String despId = "";
int count = 0;
Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
HashMap dataMap = new HashMap();
boolean isTasksConfirmed = false;
boolean isShipExist = false;
boolean isError = false;
ConsolidatToDoc consToPrc = new ConsolidatToDoc();
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.end
try try
{ {
System.out.println("*********inside try block*******"); System.out.println("*********inside try block*******");
...@@ -112,19 +145,84 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -112,19 +145,84 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
ptcn = genericUtility.getColumnValue("ptcn", headerDom); ptcn = genericUtility.getColumnValue("ptcn", headerDom);
System.out.println("ptcn ["+ptcn+"]"); System.out.println("ptcn ["+ptcn+"]");
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
java.util.Date sysDate = new java.util.Date(); java.util.Date sysDate = new java.util.Date();
String sysDateStr = sdf.format(sysDate); String sysDateStr = sdf.format(sysDate);
*/
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.end
if(ptcn == null) if(ptcn == null)
{ {
isError = true; isError = true;
System.out.println("PTCN number is null"); System.out.println("PTCN number is null");
errString = itmDBAccessEJB.getErrorString("","NULLPTCNID",""); errString = itmDBAccessEJB.getErrorString("","NULLPTCNID","");
return errString; return errString;
} }
else else
{ {
sql = "SELECT COUNT(DISTINCT WTD.PTCN) AS COUNT FROM WAVE_TASK WT, WAVE_TASK_DET WTD, DESPATCH D WHERE WT.CANCEL <> 'Y' "
+" AND WT.HOLD_STATUS <> 'Y' AND WTD.STATUS <> 'Y' AND WTD.WAVE_STATUS <> 'C' AND WTD.REF_ID = D.DESP_ID AND D.CONFIRMED <> 'Y' AND WTD.PTCN = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
if( rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(count == 0)
{
errString = itmDBAccessEJB.getErrorString("","INVPTCNID","");
return errString;
}
//to check all task confirm.start
dataMap = consToPrc.getAllTaskID(ptcn,conn);
isTasksConfirmed = consToPrc.isAllTaskConfirmed(dataMap,conn);
despId = (String)((ArrayList)dataMap.get("S-DSP")).get(0);
System.out.println("Despatch ID::::::::::::::: ["+despId+"]"+"isTasksConfirmed"+isTasksConfirmed);
if(!isTasksConfirmed)
{
errString = itmDBAccessEJB.getErrorString("","ALLTASKNOF","");
isError = true;
return errString;
}
//despId = (String)((ArrayList)dataMap.get("S-DSP")).get(0);
System.out.println("Despatch ID:::::::::::::8888:: ["+despId+"]");
isShipExist = consToPrc.isShipmentExist(despId,conn);
System.out.println("isShipExist ID::::::::::::::: ["+isShipExist+"]");
if(!isShipExist)
{
isError = true;
errString = itmDBAccessEJB.getErrorString("","CONALEXIST","");
return errString;
}
//to check all task confirm.end
if(isTasksConfirmed && isShipExist)
{
errString = consToPrc.process(ptcn,conn,xtraParams);
}
System.out.println("ERROR STRING:::::::::::::"+errString);
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
sql = "SELECT COUNT(*) AS COUNT FROM WAVE_TASK_DET WHERE PTCN = ?"; sql = "SELECT COUNT(*) AS COUNT FROM WAVE_TASK_DET WHERE PTCN = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn ); pstmt.setString(1, ptcn );
...@@ -183,6 +281,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -183,6 +281,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
"AND POD.LINE_NO = P.LINE_NO " + "AND POD.LINE_NO = P.LINE_NO " +
"AND W.PTCN = ? "; "AND W.PTCN = ? ";
*/ */
/*
sql1 = "INSERT INTO DESPATCHDET (DESP_ID, LINE_NO, SORD_NO, LINE_NO__SORD, EXP_LEV, " + sql1 = "INSERT INTO DESPATCHDET (DESP_ID, LINE_NO, SORD_NO, LINE_NO__SORD, EXP_LEV, " +
"ITEM_CODE__ORD, ITEM_CODE, LOT_NO, LOT_SL, QUANTITY__ORD, QUANTITY, LOC_CODE, " + "ITEM_CODE__ORD, ITEM_CODE, LOT_NO, LOT_SL, QUANTITY__ORD, QUANTITY, LOC_CODE, " +
"STATUS, CONV__QTY_STDUOM, UNIT__STD, UNIT, QUANTITY__STDUOM, QUANTITY_REAL, " + "STATUS, CONV__QTY_STDUOM, UNIT__STD, UNIT, QUANTITY__STDUOM, QUANTITY_REAL, " +
...@@ -214,7 +313,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -214,7 +313,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
pstmtOrder = conn.prepareStatement(sqlOrd); pstmtOrder = conn.prepareStatement(sqlOrd);
*/ */
/*
Set itmList = dataMap.keySet(); Set itmList = dataMap.keySet();
Iterator it = itmList.iterator(); Iterator it = itmList.iterator();
...@@ -288,6 +387,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -288,6 +387,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
"AND PO.PICK_ORDER = ?"; "AND PO.PICK_ORDER = ?";
*/ */
/*
sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE, " + sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE, " +
"POD.ITEM_CODE, POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, " + "POD.ITEM_CODE, POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, " +
"POD.NO_ART, POD.QUANTITY , PO.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID, POD.LINE_NO__SORD " + "POD.NO_ART, POD.QUANTITY , PO.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID, POD.LINE_NO__SORD " +
...@@ -558,6 +658,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -558,6 +658,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
//*********Calculating conversion quantity start //*********Calculating conversion quantity start
meffQty =0; meffQty =0;
*/ */
/*
if(qtyStduom == 0) if(qtyStduom == 0)
{ {
if(!unit.equalsIgnoreCase(mbaseUnit)) if(!unit.equalsIgnoreCase(mbaseUnit))
...@@ -746,9 +847,14 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -746,9 +847,14 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
return errString; return errString;
} }
} }
*/
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.end
} }
} }
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
catch(BatchUpdateException b) catch(BatchUpdateException b)
{ {
isError = true; isError = true;
...@@ -789,6 +895,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -789,6 +895,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
} }
return errString; return errString;
} }
*/
catch(Exception e) catch(Exception e)
{ {
isError = true; isError = true;
...@@ -796,6 +903,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -796,6 +903,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
errString = e.getMessage(); errString = e.getMessage();
e.printStackTrace(); e.printStackTrace();
System.out.println("error-->"+e.getMessage()); System.out.println("error-->"+e.getMessage());
try try
{ {
if(conn != null) if(conn != null)
...@@ -808,7 +917,10 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -808,7 +917,10 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
e = e1; e = e1;
} }
return errString ;
//return errString ;
//Changed by Rohan on 29-03-13 for throwing exception
throw new ITMException(e);
} }
finally finally
{ {
...@@ -829,6 +941,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -829,6 +941,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
System.out.println("ROLLBACK the changes......"); System.out.println("ROLLBACK the changes......");
conn.rollback(); conn.rollback();
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
System.out.println("Error String Coming from the validation......["+errString+"]"); System.out.println("Error String Coming from the validation......["+errString+"]");
if(errString != null && errString.length() > 0 && errString.indexOf("error") != -1) if(errString != null && errString.length() > 0 && errString.indexOf("error") != -1)
{ {
...@@ -838,8 +952,10 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -838,8 +952,10 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
{ {
errString = itmDBAccessEJB.getErrorString("","PRCFAILED",""); errString = itmDBAccessEJB.getErrorString("","PRCFAILED","");
} }
*/
} }
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
if(rs != null) if(rs != null)
{ {
rs.close(); rs.close();
...@@ -912,9 +1028,21 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -912,9 +1028,21 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
pstmtSord.close(); pstmtSord.close();
pstmtSord = null; pstmtSord = null;
}//pstmtSord }//pstmtSord
*/
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.end
conn.close(); conn.close();
conn = null; conn = null;
if( rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
} }
System.out.println("errString ["+errString +"]"); System.out.println("errString ["+errString +"]");
...@@ -925,7 +1053,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -925,7 +1053,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
errString = e.getMessage(); errString = e.getMessage();
e.printStackTrace(); e.printStackTrace();
System.out.println("error =>"+e.getMessage()); System.out.println("error =>"+e.getMessage());
//Changed by Rohan on 29-03-13 for throwing exception
throw new ITMException(e);
} }
...@@ -954,7 +1083,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -954,7 +1083,8 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
return errString; return errString;
} }
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.start
/*
private String checkNull( String input ) private String checkNull( String input )
{ {
if ( input == null ) if ( input == null )
...@@ -1183,5 +1313,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc ...@@ -1183,5 +1313,7 @@ public class ConsolidatToDocPrc extends ProcessEJB implements ConsolidatToDocPrc
return isDespExist; return isDespExist;
} }
*/
//Changed by Rohan on 29-03-13 for calling ConsolidatDoc from ConsolidatToDocPrc.end
} }
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