Skip to content

B
business-java
Commit adade008 authored by ppatro's avatar ppatro
Browse files
Options

Issuetracker point 10 239,240,242.... 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93420 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d818b4e5
Hide whitespace changes
Inline Side-by-side
Showing with 2522 additions and 125 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnLotStatConf.java
View file @ adade008
...@@ -21,9 +21,11 @@ import ibase.webitm.ejb.*; ...@@ -21,9 +21,11 @@ import ibase.webitm.ejb.*;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.dis.*; import ibase.webitm.ejb.dis.*;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
//Changed by Rohan on 24-07-13 for importing adv packages
import ibase.webitm.ejb.dis.adv.*;
@javax.ejb.Stateless @javax.ejb.Stateless
public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, AsnLotStatConfRemote public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, AsnLotStatConfRemote
{ {
...@@ -52,7 +54,24 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -52,7 +54,24 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
String tranIdGenerate = ""; String tranIdGenerate = "";
boolean flag = false; boolean flag = false;
//Change by Rohan on 25-07-13 for define variable.start
boolean isHoldHdr = false;
String invholdSql = "";
String invholddetSql = "";
String tranIdHold = "";
String lockCodeRej = "";
String locCode = "";
String lotSl = "";
int lineNoHoldCtr = 0;
PreparedStatement pstmtHdr = null;
PreparedStatement pstmtDet = null;
ResultSet rsHdr = null;
ResultSet rsDet = null;
DistCommon discommon = new DistCommon();
//Change by Rohan on 25-07-13 for define variable.end
int count = 0; int count = 0;
int updCnt = 0; int updCnt = 0;
int ctr = 0; int ctr = 0;
...@@ -112,12 +131,23 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -112,12 +131,23 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
{ {
System.out.println( updCnt + " rows updated successfully" ); System.out.println( updCnt + " rows updated successfully" );
} }
//Chnaged by Rohan on 25-07-13 for if lot staus 'R' then aquried new lock configured in disparam.start
invholdSql = "INSERT INTO INV_HOLD(TRAN_ID,TRAN_DATE,SITE_CODE,CONFIRMED,REF_ID,REF_SER,CHG_USER,CHG_DATE,CHG_TERM, LOCK_CODE,REF_NO) VALUES(?,?,?,?,?,?,?,?,?,?,?)";
pstmtHdr = conn.prepareStatement(invholdSql);
invholddetSql = "INSERT INTO INV_HOLD_DET(TRAN_ID,LINE_NO,ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL,HOLD_STATUS,SCH_REL_DATE) VALUES(?,?,?,?,?,?,?,?,?)";
pstmtDet = conn.prepareStatement(invholddetSql);
lockCodeRej = discommon.getDisparams("999999","REJECTION_LOCKCODE",conn);
//Chnaged by Rohan on 25-07-13 for if lot staus 'R' then aquried new lock configured in disparam.end
int length = dom.getElementsByTagName( "Detail2").getLength(); int length = dom.getElementsByTagName( "Detail2").getLength();
for ( int pctr = 0; pctr < length; pctr++ ) for ( int pctr = 0; pctr < length; pctr++ )
{ {
lotStatus = GenericUtility.getInstance().getColumnValueFromNode("lot_status", dom.getElementsByTagName("Detail2").item(pctr)); lotStatus = GenericUtility.getInstance().getColumnValueFromNode("lot_status", dom.getElementsByTagName("Detail2").item(pctr));
if(lotStatus.equalsIgnoreCase("A"))
//Changed by Rohan on 24-07-13 for release lot staus 'R'
//if(lotStatus.equalsIgnoreCase("A"))
if((!"".equalsIgnoreCase(lotStatus) && lotStatus != null))
{ {
lineNo = GenericUtility.getInstance().getColumnValueFromNode("line_no", dom.getElementsByTagName("Detail2").item(pctr)); lineNo = GenericUtility.getInstance().getColumnValueFromNode("line_no", dom.getElementsByTagName("Detail2").item(pctr));
itemCodeDet = GenericUtility.getInstance().getColumnValueFromNode("item_code", dom.getElementsByTagName("Detail2").item(pctr)); itemCodeDet = GenericUtility.getInstance().getColumnValueFromNode("item_code", dom.getElementsByTagName("Detail2").item(pctr));
...@@ -139,9 +169,40 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -139,9 +169,40 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
if(count != 0) if(count != 0)
{ {
ctr++; ctr++;
//flag = true; //flag = true;
sql = "select ih.tran_id, ih.line_no from inv_hold h, inv_hold_det ih" //Chnaged by Rohan on 25-07-13 for if lot staus 'R' then aquried new lock configured in disparam.start
if((!"".equalsIgnoreCase(lotStatus) && lotStatus != null) && !lotStatus.equalsIgnoreCase("A") && !isHoldHdr)
{
tranIdHold = generateTranId( "w_inv_hold", siteCode, currDateStr, conn );
System.out.println("tranIdHold"+tranIdHold);
pstmtHdr.setString( 1, tranIdHold );
pstmtHdr.setTimestamp( 2, currDate);
pstmtHdr.setString( 3, siteCode );
pstmtHdr.setString( 4, "N" );
pstmtHdr.setString( 5, tranIdGenerate );
pstmtHdr.setString( 6, "P-RCP");
pstmtHdr.setString( 7, userId );
pstmtHdr.setTimestamp( 8, currDate );
pstmtHdr.setString( 9, chgTerm );
pstmtHdr.setString( 10, lockCodeRej );
pstmtHdr.setString( 11, tranId );
updCnt = pstmtHdr.executeUpdate();
pstmtHdr.clearParameters();
if( updCnt > 0 )
{
isHoldHdr = true;
System.out.println( updCnt + " rows updated successfully" );
}
}
//Chnaged by Rohan on 25-07-13 for if lot staus 'R' then aquried new lock configured in disparam.end
//CHanged by Rohan on 26-07-13 for getting loc code and lot sl.
//sql = "select ih.tran_id, ih.line_no from inv_hold h, inv_hold_det ih"
sql = "select ih.tran_id, ih.line_no,ih.loc_code,ih.lot_sl from inv_hold h, inv_hold_det ih"
+" where h.tran_id = ih.tran_id" +" where h.tran_id = ih.tran_id"
+" and h.ref_id in (" +" and h.ref_id in ("
+" select p.tran_id from porcp p where p.asn_no in (" +" select p.tran_id from porcp p where p.asn_no in ("
...@@ -171,6 +232,25 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -171,6 +232,25 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
pRelDet.setString( 5, remark ); pRelDet.setString( 5, remark );
pRelDet.addBatch(); pRelDet.addBatch();
pRelDet.clearParameters(); pRelDet.clearParameters();
//Chnaged by Rohan on 25-07-13 for if lot staus 'R' then aquried new lock configured in disparam.start
if((!"".equalsIgnoreCase(lotStatus) && lotStatus != null) && !lotStatus.equalsIgnoreCase("A"))
{
lineNoHoldCtr++;
locCode = checkNull(rs.getString("loc_code"));
lotSl = checkNull(rs.getString("lot_sl"));
pstmtDet.setString( 1, tranIdHold );
pstmtDet.setInt( 2, lineNoHoldCtr );
pstmtDet.setString( 3, itemCodeDet );
pstmtDet.setString( 4, siteCode );
pstmtDet.setString( 5, locCode );
pstmtDet.setString( 6, lotNoDet );
pstmtDet.setString( 7, lotSl );
pstmtDet.setString( 8, "H" );
pstmtDet.setTimestamp( 9, currDate );
pstmtDet.addBatch();
pstmtDet.clearParameters();
}
//Chnaged by Rohan on 25-07-13 for if lot staus 'R' then aquried new lock configured in disparam.end
} }
rs.close(); rs.close();
...@@ -187,13 +267,81 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -187,13 +267,81 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
} }
} }
}//lotStatus = 'A' }//lotStatus = 'A'
}//for pctr }//for pctr
pRelDet.executeBatch(); pRelDet.executeBatch();
pRelDet.clearBatch(); pRelDet.clearBatch();
//Changed by Rohan on 26-07-13 for execute batch .strat
pstmtDet.executeBatch();
pstmtDet.clearBatch();
if(pstmtDet != null)
{
pstmtDet.close();
pstmtDet = null;
}
if(pstmtHdr != null)
{
pstmtHdr.close();
pstmtHdr = null;
}
//Changed by Rohan on 26-07-13 for execute batch .end
//if(flag == true) //if(flag == true)
if(length == ctr) if(length == ctr)
{ {
//Chaged by Rohan on 24-07-13 for releasing stock.start
System.out.println("888888888888 GOing for release old lock 888888888888888888888888");
InvHoldRelConf InvHoldRelConf = new InvHoldRelConf();
//confirm(tranIdRel,xtraParams,"F", conn, false);
errMsg = InvHoldRelConf.confirm( tranIdGenerate,xtraParams,"F",conn,false);
if ( errMsg == null && errMsg.trim().length() <= 0 )
{
errMsg = itmDBAccessLocal.getErrorString("","VTPRCERR","");
return errMsg;
}
//Changed by Rohan on 24-07-13 for release lot staus 'R' and then put REJECTION_LOCKCODE.start
if((!"".equalsIgnoreCase(lotStatus) && lotStatus != null) && !lotStatus.equalsIgnoreCase("A"))
{
System.out.println("888888888888 GOing for aqurie new lock 888888888888888888888888");
//update stock hold qty.start
sql = "UPDATE STOCK SET HOLD_QTY = QUANTITY WHERE ITEM_CODE = ? AND SITE_CODE = ? "
+" AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";
pStmt = conn.prepareStatement(sql);
pStmt.setString( 1, itemCodeDet );
pStmt.setString( 2, siteCode );
pStmt.setString( 3, locCode );
pStmt.setString( 4, lotNoDet );
pStmt.setString( 5, lotSl );
int rowcnt = pStmt.executeUpdate();
if(rowcnt == 0)
{
errMsg = itmDBAccessLocal.getErrorString("","VTPRCERR","");
return errMsg;
}
else
{
System.out.println("**************stk hold succefuly ****************");
}
if(pStmt != null)
{
pStmt.close();
pStmt = null;
}
//update stock hold qty.end
InvHoldConf invHoldConf = new InvHoldConf();
errMsg = invHoldConf.confirm(tranIdHold,xtraParams, "F" ,conn,false);
if ( errMsg == null && errMsg.trim().length() <= 0 )
{
errMsg = itmDBAccessLocal.getErrorString("","VTPRCERR","");
return errMsg;
}
}
//Changed by Rohan on 24-07-13 for release lot staus not 'R' and then put REJECTION_LOCKCODE.end
//Chaged by Rohan on 24-07-13 for releasing stock.end
sql = "update asn_lot_stat set confirmed = 'Y', conf_date = ? where tran_id = ?"; sql = "update asn_lot_stat set confirmed = 'Y', conf_date = ? where tran_id = ?";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setTimestamp(1,currDate); pStmt.setTimestamp(1,currDate);
...@@ -201,14 +349,10 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -201,14 +349,10 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
int rowcnt = pStmt.executeUpdate(); int rowcnt = pStmt.executeUpdate();
if(rowcnt == 0) if(rowcnt == 0)
{ {
errMsg = itmDBAccessLocal.getErrorString("","VTMCONF9",""); errMsg = itmDBAccessLocal.getErrorString("","VTPRCERR","");
return errMsg; return errMsg;
} }
else
{
//errMsg = itmDBAccessLocal.getErrorString("","VTMCONF2","");
//return errMsg;
}
} }
} }
...@@ -250,6 +394,7 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -250,6 +394,7 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
{ {
try try
{ {
if(pRelDet != null) if(pRelDet != null)
{ {
pRelDet.close(); pRelDet.close();
...@@ -265,6 +410,28 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal, ...@@ -265,6 +410,28 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
} }
//Chnaged by Rohan on 24-07-13 for commiting connection.start
if(pstmtDet != null)
{
pstmtDet.close();
pstmtDet = null;
}
if(pstmtHdr != null)
{
pstmtHdr.close();
pstmtHdr = null;
}
if ( errMsg != null && errMsg.trim().length() > 0 && errMsg.indexOf("success") != -1 )
{
conn.commit();
errMsg = "";
}
else
{
conn.rollback();
}
//Chnaged by Rohan on 24-07-13 for commiting connection.start
} }
catch(Exception ex) catch(Exception ex)
{ {
......
webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java
View file @ adade008
...@@ -521,18 +521,39 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -521,18 +521,39 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
} }
// //
update = 0;
sql = " UPDATE CARTON_MASTER SET CHANGE_STATUS = ? WHERE MASTER_CARTON = " + if(!"A".equalsIgnoreCase(pPickType))
" (SELECT MASTER_CARTON FROM CARTON_MASTER WHERE CARTON_NO = ? AND MASTER_CARTON IS NOT NULL)";
pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1, "Y");
pstmt2.setString(2, cartonNo);
update = pstmt2.executeUpdate();
if( update > 0 )
{ {
System.out.println(" WAVE_STATUS_ORG_DET updated succefully "); update = 0;
sql = " UPDATE CARTON_MASTER SET CHANGE_STATUS = ? WHERE MASTER_CARTON = " +
" (SELECT MASTER_CARTON FROM CARTON_MASTER WHERE CARTON_NO = ? AND MASTER_CARTON IS NOT NULL)";
pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1, "Y");
pstmt2.setString(2, cartonNo);
update = pstmt2.executeUpdate();
if( update > 0 )
{
System.out.println(" WAVE_STATUS_ORG_DET updated succefully for Masters----");
}
pstmt2.close(); pstmt2 = null;
}
else
{
update = 0;
sql = " UPDATE CARTON_MASTER SET CHANGE_STATUS = ? WHERE CARTON_NO = ? AND STATUS <> ? " ;
pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1, "Y");
pstmt2.setString(2, cartonNo);
pstmt2.setString(3, "R");
update = pstmt2.executeUpdate();
if( update > 0 )
{
System.out.println(" WAVE_STATUS_ORG_DET updated succefully for Actives ------ ");
}
pstmt2.close(); pstmt2 = null;
} }
pstmt2.close(); pstmt2 = null;
} }
rs.close(); rs = null; rs.close(); rs = null;
......
webitm-wms/ibase/webitm/ejb/wms/GenerateLabelsIC.java
View file @ adade008
...@@ -431,11 +431,12 @@ etc ...@@ -431,11 +431,12 @@ etc
if( "N".equalsIgnoreCase(rs.getString("HOLD_STATUS")) && "N".equalsIgnoreCase(rs.getString("CANCEL"))) if( "N".equalsIgnoreCase(rs.getString("HOLD_STATUS")) && "N".equalsIgnoreCase(rs.getString("CANCEL")))
{ {
sql = "SELECT REF_TYPE FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND REF_TYPE IN (?,?)"; sql = "SELECT REF_TYPE FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND REF_TYPE IN (?,?,?)";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, waveId); pstmt1.setString(1, waveId);
pstmt1.setString(2, "M"); pstmt1.setString(2, "M");
pstmt1.setString(3, "P"); pstmt1.setString(3, "P");
pstmt1.setString(4, "A");
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if( !rs1.next()) if( !rs1.next())
{ {
...@@ -477,7 +478,7 @@ etc ...@@ -477,7 +478,7 @@ etc
{ {
ptcn = checkNull(genericUtility.getColumnValue( "ptcn", currFormDataDom )); ptcn = checkNull(genericUtility.getColumnValue( "ptcn", currFormDataDom ));
waveId = checkNull(genericUtility.getColumnValue( "wave_id", currFormDataDom )); waveId = checkNull(genericUtility.getColumnValue( "wave_id", currFormDataDom ));
String cartonType = "";
System.out.println(" ptcn ["+ptcn+"] waveId ["+waveId+"]"); System.out.println(" ptcn ["+ptcn+"] waveId ["+waveId+"]");
if(ptcn.trim().length() > 0 ) if(ptcn.trim().length() > 0 )
{ {
...@@ -490,7 +491,9 @@ etc ...@@ -490,7 +491,9 @@ etc
while( rs.next()) while( rs.next())
{ {
isRecordExist = true; isRecordExist = true;
if( "P".equalsIgnoreCase(rs.getString("CARTON_TYPE")) || "M".equalsIgnoreCase(rs.getString("CARTON_TYPE"))) cartonType = rs.getString("CARTON_TYPE");
//if( "P".equalsIgnoreCase(rs.getString("CARTON_TYPE")) || "M".equalsIgnoreCase(rs.getString("CARTON_TYPE")))
if( "P".equalsIgnoreCase(cartonType) || "M".equalsIgnoreCase(cartonType) || "A".equalsIgnoreCase(cartonType))
{ {
isMasterOrParcelPresent = true; isMasterOrParcelPresent = true;
continue; continue;
......
webitm-wms/ibase/webitm/ejb/wms/GenerateLabelsPrc.java
View file @ adade008
...@@ -40,6 +40,8 @@ import java.util.ArrayList; ...@@ -40,6 +40,8 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.TreeMap; import java.util.TreeMap;
...@@ -56,6 +58,7 @@ import com.adsionline.ADSIShippingWS.*; ...@@ -56,6 +58,7 @@ import com.adsionline.ADSIShippingWS.*;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.apache.axis.Constants; import org.apache.axis.Constants;
import org.apache.axis.description.ParameterDesc; import org.apache.axis.description.ParameterDesc;
import org.apache.poi.hssf.record.formula.functions.Reftext;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import sun.misc.BASE64Decoder; import sun.misc.BASE64Decoder;
...@@ -118,7 +121,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -118,7 +121,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
String printStatus = ""; String printStatus = "";
String confirmed = ""; String confirmed = "";
String adsiShippingURL = "",imagePath = ""; String adsiShippingURL = "",imagePath = "";
String masterCarton = "",itemCode = "",trackingNo = "",parcelCartonNo = "",cartonStatus = ""; String masterCarton = "",itemCode = "",trackingNo = "",parcelCartonNo = "",
cartonStatus = "",chgStatus = "";
String tempItemCode = ""; String tempItemCode = "";
String value = "",outerCartonNo = "",trackNo = "",pckgId = ""; String value = "",outerCartonNo = "",trackNo = "",pckgId = "";
long msnNo = 0; long msnNo = 0;
...@@ -136,7 +140,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -136,7 +140,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
int package2ArrSize = 0; int package2ArrSize = 0;
double packSize = 0.0; double packSize = 0.0;
double weight = 0.0; double weight = 0.0,actWeight = 0.0,itemWeght = 0.0,shipQty = 0.0;
NodeList parentNodeList = null; NodeList parentNodeList = null;
NodeList childNodeList = null; NodeList childNodeList = null;
...@@ -152,6 +156,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -152,6 +156,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
ADSIShippingLocator locator = null; ADSIShippingLocator locator = null;
ADSIShippingSoap soap = null; ADSIShippingSoap soap = null;
List arryOuterCartonNo = new ArrayList(); List arryOuterCartonNo = new ArrayList();
LinkedHashMap linkedMap = new LinkedHashMap();
try try
{ {
...@@ -175,7 +180,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -175,7 +180,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
sqlPrintStatus = "SELECT DISTINCT PRINT_STATUS FROM WAVE_STATUS_ORG WHERE PTCN = ?"; sqlPrintStatus = "SELECT DISTINCT PRINT_STATUS FROM WAVE_STATUS_ORG WHERE PTCN = ?";
pstmtPrintStatus = conn.prepareStatement(sqlPrintStatus); pstmtPrintStatus = conn.prepareStatement(sqlPrintStatus);
sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON"; //sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS,CHANGE_STATUS,MSN_NO,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
pstmtMaster = conn.prepareStatement(sqlMaster); pstmtMaster = conn.prepareStatement(sqlMaster);
sqlCrtnChg = "UPDATE CARTON_MASTER SET CHANGE_STATUS = ? WHERE PTCN = ?"; sqlCrtnChg = "UPDATE CARTON_MASTER SET CHANGE_STATUS = ? WHERE PTCN = ?";
...@@ -215,21 +221,23 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -215,21 +221,23 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
} }
if( waveId.trim().length() > 0 && ptcn.trim().length() == 0) if( waveId.trim().length() > 0 && ptcn.trim().length() == 0)
{ {
sql = " SELECT DISTINCT PTCN,SALE_ORDER,REF_TYPE FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND REF_TYPE IN (?,?)"; sql = " SELECT DISTINCT PTCN,SALE_ORDER,REF_TYPE FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND REF_TYPE IN (?,?,?)";
ptcnPSTMT = conn.prepareStatement(sql); ptcnPSTMT = conn.prepareStatement(sql);
ptcnPSTMT.setString(1, waveId); ptcnPSTMT.setString(1, waveId);
ptcnPSTMT.setString(2, "M"); ptcnPSTMT.setString(2, "M");
ptcnPSTMT.setString(3, "P"); ptcnPSTMT.setString(3, "P");
ptcnPSTMT.setString(4, "A");
ptcnRS = ptcnPSTMT.executeQuery(); ptcnRS = ptcnPSTMT.executeQuery();
} }
else if( waveId.trim().length() > 0 && ptcn.trim().length() > 0) else if( waveId.trim().length() > 0 && ptcn.trim().length() > 0)
{ {
sql = " SELECT DISTINCT PTCN,SALE_ORDER,REF_TYPE FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND PTCN = ? AND REF_TYPE IN (?,?) "; sql = " SELECT DISTINCT PTCN,SALE_ORDER,REF_TYPE FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND PTCN = ? AND REF_TYPE IN (?,?,?) ";
ptcnPSTMT = conn.prepareStatement(sql); ptcnPSTMT = conn.prepareStatement(sql);
ptcnPSTMT.setString(1, waveId); ptcnPSTMT.setString(1, waveId);
ptcnPSTMT.setString(2, ptcn); ptcnPSTMT.setString(2, ptcn);
ptcnPSTMT.setString(3, "M"); ptcnPSTMT.setString(3, "M");
ptcnPSTMT.setString(4, "P"); ptcnPSTMT.setString(4, "P");
ptcnPSTMT.setString(5, "A");
ptcnRS = ptcnPSTMT.executeQuery(); ptcnRS = ptcnPSTMT.executeQuery();
} }
...@@ -322,14 +330,17 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -322,14 +330,17 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
System.out.println("masterCarton ["+masterCarton+"]"); System.out.println("masterCarton ["+masterCarton+"]");
parcelCartonNo = rsMaster.getString("CARTON_NO"); parcelCartonNo = rsMaster.getString("CARTON_NO");
cartonStatus = rsMaster.getString("STATUS"); cartonStatus = rsMaster.getString("STATUS");
System.out.println("parcelCartonNo ["+parcelCartonNo+"]"); chgStatus = rsMaster.getString("CHANGE_STATUS");
oldMsnNo = rsMaster.getLong("MSN_NO");
oldCarrierSymbol = rsMaster.getString("CARRIER_SYMBOL");
System.out.println("parcelCartonNo ["+parcelCartonNo+"]CARRIER_SYMBOL["+oldCarrierSymbol+"]["+oldMsnNo+"]Change Status["+chgStatus+"]");
if("M".equalsIgnoreCase(refType)) if("M".equalsIgnoreCase(refType))
{ {
boolean isExist = false; boolean isExist = false;
tempItemCode = ""; tempItemCode = "";
int itemCount = 0; int itemCount = 0;
LinkedList liklist = new LinkedList(); //LinkedList liklist = new LinkedList();
if( !"NO".equalsIgnoreCase(serviceCode) ) if( !"NO".equalsIgnoreCase(serviceCode) )
{ {
...@@ -361,12 +372,16 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -361,12 +372,16 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
packSize = rs1.getDouble("WEIGHT"); packSize = rs1.getDouble("WEIGHT");
itemCode = rs1.getString("ITEM_CODE"); itemCode = rs1.getString("ITEM_CODE");
if( !tempItemCode.equalsIgnoreCase(itemCode)) /*if( !tempItemCode.equalsIgnoreCase(itemCode))
{ {
tempItemCode = itemCode; tempItemCode = itemCode;
liklist.add(tempItemCode); liklist.add(tempItemCode);
//linkedMap.put(arg0, arg1);
} }
*/
weight = weight + packSize; weight = weight + packSize;
linkedMap.put(itemCode, weight);
} }
rs1.close(); rs1 = null; rs1.close(); rs1 = null;
...@@ -381,8 +396,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -381,8 +396,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
else else
{ {
arryOuterCartonNo.add(masterCarton); arryOuterCartonNo.add(masterCarton);
CommodityInfo[] comInfo = new CommodityInfo[liklist.size()]; CommodityInfo[] comInfo = new CommodityInfo[linkedMap.size()];
comInfo = setCommodityInfos(liklist, masterCarton, saleOrder, soap, conn); comInfo = setCommodityInfos(linkedMap, masterCarton, saleOrder, soap,refType, conn);
System.out.println("old weight ["+packages2[count].getWeight()+"]"); System.out.println("old weight ["+packages2[count].getWeight()+"]");
System.out.println("new weight ["+weight+"]"); System.out.println("new weight ["+weight+"]");
packages2[count].setWeight(weight); packages2[count].setWeight(weight);
...@@ -399,7 +414,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -399,7 +414,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
else else
{ {
sql = " SELECT CM.ITEM_CODE,WOD.WEIGHT,CM.MSN_NO,CM.CARRIER_SYMBOL , CM.CARRIER_FRIENDLYNAME FROM CARTON_MASTER CM, " + /*sql = " SELECT CM.ITEM_CODE,WOD.WEIGHT,CM.MSN_NO,CM.CARRIER_SYMBOL , CM.CARRIER_FRIENDLYNAME FROM CARTON_MASTER CM, " +
" WAVE_STATUS_ORG_DET WOD WHERE CM.PTCN = WOD.PTCN " + " WAVE_STATUS_ORG_DET WOD WHERE CM.PTCN = WOD.PTCN " +
" AND CM.CARTON_NO = WOD.CARTON_NO AND CM.CARTON_NO = ? AND CM.CARTON_TYPE = ? AND CM.STATUS = ? " + " AND CM.CARTON_NO = WOD.CARTON_NO AND CM.CARTON_NO = ? AND CM.CARTON_TYPE = ? AND CM.STATUS = ? " +
" ORDER BY CM.ITEM_CODE"; " ORDER BY CM.ITEM_CODE";
...@@ -429,14 +444,61 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -429,14 +444,61 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
else else
{ {
arryOuterCartonNo.add(parcelCartonNo); arryOuterCartonNo.add(parcelCartonNo);
}*/
if("R".equalsIgnoreCase(cartonStatus))
{
packages2[count] = null;
StringReturn testReturn = soap.voidPackage(oldCarrierSymbol,oldMsnNo);
response = testReturn.getResponse();
System.out.println("response Parcel void----["+response+"]");
}
else
{
arryOuterCartonNo.add(parcelCartonNo);
if("A".equalsIgnoreCase(refType) && "Y".equalsIgnoreCase(chgStatus))
{
sql = "SELECT ITEM_CODE,SUM(QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE CASE WHEN DEALLOC_QTY IS NULL"
+" THEN 0 ELSE DEALLOC_QTY END END) AS QTY FROM PICK_ORD_DET WHERE CARTON_NO = ? GROUP BY ITEM_CODE";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, parcelCartonNo);
rs1 = pstmt1.executeQuery();
while( rs1.next())
{
itemCode = rs1.getString("ITEM_CODE");
shipQty = rs1.getDouble("QTY");
HashMap itmVolumeMap = getItemVoumeMap(itemCode, "", conn);
itemWeght = (Double)itmVolumeMap.get("ITEM_WEIGHT");
weight = weight + itemWeght * shipQty;
linkedMap.put(itemCode, shipQty);
}
rs1.close(); rs1 = null;
pstmt1.close(); pstmt1 = null;
CommodityInfo[] comInfo = new CommodityInfo[linkedMap.size()];
comInfo = setCommodityInfos(linkedMap, masterCarton, saleOrder, soap,refType, conn);
System.out.println("old weight ["+packages2[count].getWeight()+"]");
System.out.println("new weight ["+weight+"]");
packages2[count].setWeight(weight);
System.out.println("old comodity info length ["+packages2[count].getCommodityInfos().length+"]");
System.out.println("new comodity info length ["+comInfo.length+"]");
packages2[count].setCommodityInfos(comInfo);
}
} }
oldMsnNo = 0;oldCarrierSymbol = ""; oldMsnNo = 0;oldCarrierSymbol = "";
oldCarrierFriendlyName = ""; oldCarrierFriendlyName = "";
rs1.close(); rs1 = null; /*rs1.close(); rs1 = null;
pstmt1.close(); pstmt1 = null; pstmt1.close(); pstmt1 = null;*/
count++; count++;
} }
} }
pstmtMaster.clearParameters(); pstmtMaster.clearParameters();
...@@ -966,7 +1028,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -966,7 +1028,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
///return cartonMasterTranCode; ///return cartonMasterTranCode;
} }
private CommodityInfo[] setCommodityInfos(LinkedList list,String masterCarton,String saleOrder,ADSIShippingSoap soap,Connection conn) throws ITMException private CommodityInfo[] setCommodityInfos(LinkedHashMap linkMap,String masterCarton,String saleOrder,ADSIShippingSoap soap,String cartonType ,Connection conn) throws ITMException
{ {
String itemCode = ""; String itemCode = "";
String harmonizDescr = ""; String harmonizDescr = "";
...@@ -975,37 +1037,48 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -975,37 +1037,48 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
String nafFlag = ""; String nafFlag = "";
String shipCountry = ""; String shipCountry = "";
double unitValue = 0,caseWeight = 0; double unitValue = 0,caseWeight = 0,itemWeight = 0;
double packSizeCase = 0,noArt =0; double packSizeCase = 0,noArt =0;
CommodityInfo[] commoList; CommodityInfo[] commoList;
int cCtr = 0;
try try
{ {
System.out.println("GenerateLabelsPrc.setCommodityInfos()"); System.out.println("GenerateLabelsPrc.setCommodityInfos()");
System.out.println("list.size ["+list.size()+"]"); System.out.println("list.size ["+linkMap.size()+"]");
commoList = new CommodityInfo[list.size()]; commoList = new CommodityInfo[linkMap.size()];
nafFlag = discommon.getDisparams("999999","NAFTA_FLAG_COUNT",conn); nafFlag = discommon.getDisparams("999999","NAFTA_FLAG_COUNT",conn);
CommodityInfo comInfo = new CommodityInfo(); CommodityInfo comInfo = new CommodityInfo();
for( int i = 0 ; i < list.size() ; i++) Iterator it = linkMap.keySet().iterator();
//for( int i = 0 ; i < list.size() ; i++)
while(it.hasNext())
{ {
itemCode = (String) list.get(i); itemCode = (String)it.next();
comInfo = new CommodityInfo(); comInfo = new CommodityInfo();
System.out.println(" item_code ["+itemCode+"]"); System.out.println(" item_code ["+itemCode+"]");
HashMap itmVolumeMap = getItemVoumeMap(itemCode, "", conn);
harmonizDescr = (String)itmVolumeMap.get("HARMONIZATION_DESCR");
harmonizCode = (String)itmVolumeMap.get("HARMONIZATION_NO");
caseWeight = (Double)itmVolumeMap.get("PACK_WEIGHT");
originCountry = (String)itmVolumeMap.get("ORIGIN_COUNTRY");
packSizeCase = (Double)itmVolumeMap.get("PACK_SIZE");
unitValue = getRateStdoum(saleOrder, itemCode, conn); if(!"A".equalsIgnoreCase(cartonType))
{
HashMap itmVolumeMap = getItemVoumeMap(itemCode, "", conn);
harmonizDescr = (String)itmVolumeMap.get("HARMONIZATION_DESCR");
harmonizCode = (String)itmVolumeMap.get("HARMONIZATION_NO");
caseWeight = (Double)itmVolumeMap.get("PACK_WEIGHT");
originCountry = (String)itmVolumeMap.get("ORIGIN_COUNTRY");
packSizeCase = (Double)itmVolumeMap.get("PACK_SIZE");
noArt = getItemCount(masterCarton, itemCode, conn);
comInfo.setQuantity(noArt * packSizeCase);
}
else
{
noArt = (Double)linkMap.get(itemCode);
comInfo.setQuantity(noArt);
}
unitValue = getRateStdoum(saleOrder, itemCode, conn);
comInfo.setDescription(harmonizDescr);//As per taro Harmonization description comInfo.setDescription(harmonizDescr);//As per taro Harmonization description
noArt = getItemCount(masterCarton, itemCode, conn);
comInfo.setQuantity(noArt * packSizeCase);
//comInfo.setQuantity(); //comInfo.setQuantity();
comInfo.setHarmonizedCode(harmonizCode);//As per Taro Haromonization code comInfo.setHarmonizedCode(harmonizCode);//As per Taro Haromonization code
comInfo.setUnitValue(unitValue); comInfo.setUnitValue(unitValue);
...@@ -1030,7 +1103,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -1030,7 +1103,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
comInfo.setExportNumberExpireDate(calendar); comInfo.setExportNumberExpireDate(calendar);
comInfo.setUnitOfMeasure(EnumUnitOfMeasure.uomPCS); comInfo.setUnitOfMeasure(EnumUnitOfMeasure.uomPCS);
commoList[i] = comInfo; commoList[cCtr] = comInfo;
cCtr++;
} }
} }
......
webitm-wms/ibase/webitm/ejb/wms/PickIssConf.java
View file @ adade008
...@@ -1013,6 +1013,22 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1013,6 +1013,22 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
System.out.println( updCnt + " row of wave_status updated successfully" ); System.out.println( updCnt + " row of wave_status updated successfully" );
} }
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after start scaning .start
sql = "UPDATE SORDER SET SHIP_STATUS = ? WHERE SALE_ORDER = ?";
pstmtSord = conn.prepareStatement(sql);
int updateSorder = 0;
pstmtSord.setString(1, "P");
pstmtSord.setString(2, saleOrder);
updateSorder = pstmtSord.executeUpdate();
if(updateSorder > 0)
{
System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]");
}
pstmtSord.clearParameters();
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after after start scaning .end
//Changed by sumit on 07/08/12 for checking whether pick iss is inserted or not if yes then remaining, wave_task of M-Pack ref_ser will updated 'c' end. //Changed by sumit on 07/08/12 for checking whether pick iss is inserted or not if yes then remaining, wave_task of M-Pack ref_ser will updated 'c' end.
/*Added by Ashish Sonawane on 11-SEP-12 for calling consolidate to doc after status of PICK_ORD_HDR gets close [START]*/ /*Added by Ashish Sonawane on 11-SEP-12 for calling consolidate to doc after status of PICK_ORD_HDR gets close [START]*/
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssConf.java
View file @ adade008
...@@ -1348,6 +1348,29 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote, ...@@ -1348,6 +1348,29 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
pstmtUpd.close(); pstmtUpd.close();
pstmtUpd = null; pstmtUpd = null;
} }
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after start scaning .start
sql = "UPDATE SORDER SET SHIP_STATUS = ? WHERE SALE_ORDER = ?";
pstmtUpd = conn.prepareStatement(sql);
int updateSorder = 0;
pstmtUpd.setString(1, "P");
pstmtUpd.setString(2, saleOrder);
updateSorder = pstmtUpd.executeUpdate();
if(updateSorder > 0)
{
System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]");
}
pstmtUpd.clearParameters();
if(pstmtUpd != null)
{
pstmtUpd.close();
pstmtUpd = null;
}
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after after start scaning .end
ConsolidatToDoc conToDoc = new ConsolidatToDoc(); ConsolidatToDoc conToDoc = new ConsolidatToDoc();
//Changed by Rohan on 10-06-12 to add xtraParams in process as argument for hazmap report to get chg user //Changed by Rohan on 10-06-12 to add xtraParams in process as argument for hazmap report to get chg user
//retString = conToDoc.process(ptcn, conn); //retString = conToDoc.process(ptcn, conn);
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentConf.java
View file @ adade008
...@@ -16,6 +16,14 @@ import ibase.webitm.utility.GenericUtility; ...@@ -16,6 +16,14 @@ import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
import java.awt.image.BufferedImage;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.net.URL; import java.net.URL;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
...@@ -31,6 +39,7 @@ import java.util.HashMap; ...@@ -31,6 +39,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.imageio.ImageIO;
import javax.xml.rpc.ParameterMode; import javax.xml.rpc.ParameterMode;
import org.apache.axis.client.Call; import org.apache.axis.client.Call;
...@@ -43,8 +52,26 @@ import org.w3c.dom.NodeList; ...@@ -43,8 +52,26 @@ import org.w3c.dom.NodeList;
//Changed by sumit on 06/10/12 //Changed by sumit on 06/10/12
import org.w3c.dom.*; import org.w3c.dom.*;
import sun.misc.BASE64Decoder;
import com.adsionline.ADSIShippingWS.ADSIShippingLocator; import com.adsionline.ADSIShippingWS.ADSIShippingLocator;
import com.adsionline.ADSIShippingWS.ADSIShippingSoap; import com.adsionline.ADSIShippingWS.ADSIShippingSoap;
import com.adsionline.ADSIShippingWS.Address;
import com.adsionline.ADSIShippingWS.CommodityInfo;
import com.adsionline.ADSIShippingWS.Country;
import com.adsionline.ADSIShippingWS.EnumManifestAction;
import com.adsionline.ADSIShippingWS.EnumPackageType;
import com.adsionline.ADSIShippingWS.EnumTerms;
import com.adsionline.ADSIShippingWS.EnumTimeInTransit;
import com.adsionline.ADSIShippingWS.EnumUnitOfMeasure;
import com.adsionline.ADSIShippingWS.ImageRotation;
import com.adsionline.ADSIShippingWS.NameValuePair;
import com.adsionline.ADSIShippingWS.Package2;
import com.adsionline.ADSIShippingWS.PackageResult2;
import com.adsionline.ADSIShippingWS.ShipWithLabelType;
import com.adsionline.ADSIShippingWS.Shipment2;
import com.adsionline.ADSIShippingWS.ShipmentResult2;
import com.adsionline.ADSIShippingWS.ShipmentResultReturn2;
import com.adsionline.ADSIShippingWS.StringDictionaryReturn; import com.adsionline.ADSIShippingWS.StringDictionaryReturn;
...@@ -56,7 +83,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -56,7 +83,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
{ {
int cnt = 0; int cnt = 0;
String errString = ""; String errString = "";
String sql = ""; String sql = "",sSQLUpdatSord = "";
String refId = "",proNo = "",tranProNo = ""; String refId = "",proNo = "",tranProNo = "";
String lorryNo = ""; String lorryNo = "";
String tranCode = ""; String tranCode = "";
...@@ -75,11 +102,82 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -75,11 +102,82 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt1 = null; PreparedStatement pstmt1 = null,pstmtSord = null;
// changed by sankara on 12-07-13 for confirmation of consumption issue start... // changed by sankara on 12-07-13 for confirmation of consumption issue start...
String winName = ""; String winName = "";
String objName = ""; String objName = "";
// changed by sankara on 12-07-13 for confirmation of consumption issue end... // changed by sankara on 12-07-13 for confirmation of consumption issue end...
//Changed by Rohan on 03-june define variables for manual shipment print lable.start
String adsiShippingURL = "";
DistCommon discommon = new DistCommon();
ADSIShippingLocator locator = null;
ADSIShippingSoap soap = null;
Shipment2 shipment2 = null;
Address recipient = null;
Package2 pkg2 = null;
CommodityInfo comInfo = null;
ArrayList<String> cartonNoList = new ArrayList<String>();
String custCodeDlv = "";
String custName = "";
String custShName = "";
String shipAdd1 = "";
String shipAdd2 = "";
String shipAdd3 = "";
String shipCity = "";
String stateCodeDlv = "";
String descr = "";
String shipCountry = "";
String shipPh = "";
String shipMailId = "";
String shipFax = "";
String serviceCode = "";
String ptcn = "";
String saleOrder = "";
String custPord = "";
String cartonNo = "";
String sqlSize = "";
String sqlNoPkg = "";
String originCountry = "";
String harmonizDescr = "";
String harmonizCode = "";
String itemCode = "";
String sqlItem ="";
String strlen = "";
String widthStr = "";
String heightStr = "";
String dimension = "";
String hazardous = "";
String defPh = "";
String shipPin = "";
String palleNo = "";
String pkgDescr = "";
String status = "",palletNo = "",itemDescr = "";
String frtList ="",frtTerm = "";
int pkg = 0;
int noOfPkg = 0;
int noOfPkgs = 0;
int commCnt = 0;
double caseWeightTotal = 0.0;
double slength = 0.0;
double width = 0.0;
double height = 0.0;
double noArt = 0.0;
double packSizeCase = 0.0;
double caseWeight = 0.0;
double unitValue = 0.0;
double dimensionDouble = 0.0;
CommodityInfo[] infoCom1 = null;
PreparedStatement pstmt2 = null;
PreparedStatement pstmt3 = null;
ResultSet rs2 = null;
ResultSet rs3 = null;
//Changed by Rohan on 03-june define variables for manual shipment print lable.start
try try
{ {
conn = connDriver.getConnectDB( "DriverITM" ); conn = connDriver.getConnectDB( "DriverITM" );
...@@ -87,9 +185,13 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -87,9 +185,13 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
//Changed by sumit on 28/09/12 checking whether shipment is already confirmed or not start. //Changed by sumit on 28/09/12 checking whether shipment is already confirmed or not start.
System.out.println(" forced flag ["+forcedFlag+"]"); System.out.println(" forced flag ["+forcedFlag+"]");
ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB(); ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
//Changed by Rohan on 30-07-13 for non inventory manual shipment
/*
sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET, SHIP_DOCS.REF_SER " + sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET, SHIP_DOCS.REF_SER " +
" FROM SHIPMENT, SHIP_DOCS WHERE SHIPMENT.SHIPMENT_ID = ? " + " FROM SHIPMENT, SHIP_DOCS WHERE SHIPMENT.SHIPMENT_ID = ? " +
" AND SHIP_DOCS.SHIPMENT_ID = SHIPMENT.SHIPMENT_ID"; " AND SHIP_DOCS.SHIPMENT_ID = SHIPMENT.SHIPMENT_ID";
*/
sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET FROM SHIPMENT WHERE SHIPMENT.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -97,11 +199,24 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -97,11 +199,24 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
{ {
confirmed = rs.getString("CONFIRMED"); confirmed = rs.getString("CONFIRMED");
noOfPallet = rs.getInt("NO_PALLET"); noOfPallet = rs.getInt("NO_PALLET");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
//Changed by Rohan on 30-07-13 for getting ref ser.start
sql = "SELECT REF_SER FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if( rs.next())
{
refSer = checkNull(rs.getString("REF_SER")); refSer = checkNull(rs.getString("REF_SER"));
} }
System.out.println("-- confirmed ["+confirmed+"] noOfPallet ["+noOfPallet+"] refSer ["+refSer.trim()+"]"); System.out.println("-- confirmed ["+confirmed+"] noOfPallet ["+noOfPallet+"] refSer ["+refSer.trim()+"]");
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
//Changed by Rohan on 30-07-13 for getting pallet No .start
if( "Y".equalsIgnoreCase(confirmed)) if( "Y".equalsIgnoreCase(confirmed))
{ {
...@@ -115,6 +230,61 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -115,6 +230,61 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
} }
else else
{ {
//Chnaged by Rohan on 31-07-13 for checking status of pallet No.start
if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
{
if(noOfPallet <= 0 && !refSer.trim().equalsIgnoreCase("S-DSP"))
{
errString = itmDBAccessLocal.getErrorString("","VTINVPALNO","");
return errString;
}
sql = "SELECT STATUS FROM PALLET_NO WHERE PALLET_NO IN ( SELECT PALLET_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while( rs.next() )
{
status = checkNull(rs.getString("STATUS"));
if((!"".equalsIgnoreCase(status) || status != null ) && !"A".equalsIgnoreCase(status) )
{
errString = itmDBAccessLocal.getErrorString("","VTINVPALET","");
return errString;
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT STATUS FROM CARTON_MASTER WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while( rs.next() )
{
status = checkNull(rs.getString("STATUS"));
if((!"".equalsIgnoreCase(status) || status != null ) && !"A".equalsIgnoreCase(status) )
{
errString = itmDBAccessLocal.getErrorString("","VTINVCARTN","");
return errString;
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
//Changed by Rohan on 31-07-13 for checking status of pallet No.end
sql = "SELECT COUNT(*) as COUNT FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ?"; sql = "SELECT COUNT(*) as COUNT FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
...@@ -129,7 +299,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -129,7 +299,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
{ {
errString = itmDBAccessLocal.getErrorString("","NOOFPALLET",""); errString = itmDBAccessLocal.getErrorString("","NOOFPALLET","");
} }
else else
{ {
//Changed by sumit on 10/11/12 updating lr_no and pro_no in shipment start. //Changed by sumit on 10/11/12 updating lr_no and pro_no in shipment start.
if( updateShipment(tranId , conn, xtraParam) > 0) if( updateShipment(tranId , conn, xtraParam) > 0)
...@@ -175,6 +345,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -175,6 +345,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sSQLUpdatSord = "UPDATE SORDER SET SHIP_STATUS = ? WHERE SALE_ORDER IN (SELECT SORD_NO FROM DESPATCH WHERE DESP_ID = ?)";
pstmtSord = conn.prepareStatement(sSQLUpdatSord);
//Changed by sumit on 05/10/12 added condition where ref_ser = S-DSP //Changed by sumit on 05/10/12 added condition where ref_ser = S-DSP
//sql = "SELECT REF_ID FROM SHIP_DOCS WHERE SHIPMENT_ID = ?"; //sql = "SELECT REF_ID FROM SHIP_DOCS WHERE SHIPMENT_ID = ?";
sql = "SELECT REF_ID, REF_SER FROM SHIP_DOCS WHERE SHIPMENT_ID = ? AND DESP_CONFIRMED = 'N'"; sql = "SELECT REF_ID, REF_SER FROM SHIP_DOCS WHERE SHIPMENT_ID = ? AND DESP_CONFIRMED = 'N'";
...@@ -259,7 +432,19 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -259,7 +432,19 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmt1.executeUpdate(); pstmt1.executeUpdate();
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
//conn.commit(); //conn.commit();
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .start
pstmtSord.setString(1, "C");
pstmtSord.setString(2, refId);
int updateSorder = pstmtSord.executeUpdate();
if(updateSorder > 0)
{
System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]");
}
pstmtSord.clearParameters();
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
} }
//changed by sankara on 12-07-13 for confirmation of consumption issue start.... //changed by sankara on 12-07-13 for confirmation of consumption issue start....
...@@ -287,6 +472,839 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -287,6 +472,839 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
//Changed by sumit on 05/10/12 adding condition to check whether all despatch are confirmed or not //Changed by sumit on 05/10/12 adding condition to check whether all despatch are confirmed or not
if( isCountSame(tranId, conn) || !("S-DSP".equalsIgnoreCase(refSer.trim()))) if( isCountSame(tranId, conn) || !("S-DSP".equalsIgnoreCase(refSer.trim())))
{ {
//Changed by Rohna on 22-07-13 for generating UPS/FEDEX lable in case of manual shipment.start
if("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) || "".equalsIgnoreCase(refSer.trim()))
{
System.out.println("Enetr in manual Shipment whit shipment ID"+tranId);
adsiShippingURL = discommon.getDisparams("999999","WMS_ADSI_SOAP_URL",conn);
defPh = discommon.getDisparams("999999","SHIPPER_DEFAULT_PH",conn);
com.adsionline.ADSIShippingWS.Service service = new com.adsionline.ADSIShippingWS.Service();
NameValuePair[] additionalFields = new NameValuePair[1];
Package2[] packgeList = null;
ArrayList<CommodityInfo> comodityInfoList = new ArrayList<CommodityInfo>();
System.out.println("After disparm value"+adsiShippingURL);
long timeBefore = System.currentTimeMillis();
locator = new ADSIShippingLocator();
soap = locator.getADSIShippingSoap(new URL(adsiShippingURL));
long timeAfter = System.currentTimeMillis();
System.out.println("Differance In Tme for connecting to ADSI Server time differance in seconds["+(timeAfter-timeBefore)/1000+"]");
if(soap.testADSIServer())
{
System.out.println("---ADSI Server Connected---");
//Changed by Rohan on 30-07-13 for generating UPS/FEDEX lable in case of inventory manual shipment.start
if("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()))
{
System.out.println("************Enter in manual shiment for inventory item ******************************");
sql = "SELECT S.CONSIGNEE_NAME,S.ADDR1,S.ADDR2,S.ADDR3,S.CITY,S.COUNT_CODE,S.STATE_CODE,S.PIN,S.PKG_DESCR,S.UNIT_VALUE,S.ITEM_DESCR,S.FRT_LIST "
+" FROM SHIPMENT S WHERE S.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
//custCodeDlv = checkNull(rs.getString("CUST_CODE"));
custName = checkNull(rs.getString("CONSIGNEE_NAME"));
//custShName = checkNull(rs.getString("SH_NAME"));
shipAdd1 = checkNull(rs.getString("ADDR1"));
shipAdd2 = checkNull(rs.getString("ADDR2"));
shipAdd3 = checkNull(rs.getString("ADDR3"));
shipCity = checkNull(rs.getString("CITY"));
shipCountry = checkNull(rs.getString("COUNT_CODE"));
//shipPh = checkNull(rs.getString("TELE1"));
//shipMailId = checkNull(rs.getString("EMAIL_ADDR"));
//shipFax = checkNull(rs.getString("FAX"));
stateCodeDlv = checkNull(rs.getString("STATE_CODE"));
shipPin = checkNull(rs.getString("PIN"));
pkgDescr = checkNull(rs.getString("PKG_DESCR"));
itemDescr = checkNull(rs.getString("ITEM_DESCR"));
unitValue = rs.getDouble("UNIT_VALUE");
//frtList = checkNull(rs.getString("FRT_LIST"));
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
/*
if(!"".equalsIgnoreCase(frtList) && frtList.trim().length() > 0)
{
sql = "SELECT FRT_TERM FROM FREIGHT_LIST WHERE FRT_LIST = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, frtList);
rs = pstmt.executeQuery();
if(rs.next())
{
frtTerm = checkNull(rs.getString("FRT_TERM"));
}
pstmt.close();pstmt = null;
rs.close();rs = null;
}
*/
shipment2 = new Shipment2();
recipient = new Address();//To set the Address
//Setting Shipment ID
shipment2.setID(refId);
//recipient.setID(custCodeDlv);//Customer Code
recipient.setID(custName);//Customer Code
recipient.setContact(custName);//Customer Name
recipient.setCompany(custName);//Customer Company Name
recipient.setAddress1(shipAdd1);//Customer Adress1
recipient.setAddress2(shipAdd2);//Customer Adress2
recipient.setAddress3(shipAdd3);//Customer Adress3
recipient.setCity(shipCity);//Customer Adress City
sql = "SELECT T.SERVICE_CODE,S.PACK_SIZE FROM SHIPMENT S,TRANSPORTER T WHERE T.TRAN_CODE = S.TRAN_CODE AND"
+" S.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
serviceCode = checkNull(rs.getString("SERVICE_CODE"));
dimensionDouble = rs.getDouble("PACK_SIZE");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
recipient.setState(stateCodeDlv);//Customer Adress State
Country country = soap.getCountry("ISO3", shipCountry).getResponseCountry();
recipient.setCountry(country);//Customer Adress Country
recipient.setPhone(defPh);
recipient.setEMail("");
recipient.setFax("");
recipient.setPostalCode(shipPin);
shipment2.setRecipient(recipient);
service.setFriendlyName(serviceCode);
shipment2.setService(service);
System.out.println("Service name is :"+shipment2.getService());
System.out.println("Service code is :"+serviceCode);
/*
if(!"".equalsIgnoreCase(frtTerm) && frtTerm.trim().length() > 0)
{
shipment2.setTerms(EnumTerms.fromString(frtTerm));
}
else
{
shipment2.setTerms(EnumTerms.trmSHIPPER);
}
*/
shipment2.setTerms(EnumTerms.trmSHIPPER);
//HardCoded valus needs to be change later.
shipment2.setSignatureReleaseFlag(false);//false As per Taro
shipment2.setSignatureRequiredFlag(false);//true Required As per Taro
shipment2.setSaturdayDeliveryFlag(false);// Taro Need To clerify "what is based on service level?"
java.util.Date date = new java.util.Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
shipment2.setShipDate(calendar);
shipment2.setConsigneeAccount("");//Not Required As per Taro
shipment2.setThirdPartyBillingFlag(false);//Not Required As per Taro
shipment2.setThirdPartyBillingAccount("");//Not Required As per Taro
Address addrs = new Address();//Need to capture if required
shipment2.setThirdPartyBillingAddress(addrs);//Not Required As per Taro
shipment2.setHALFlag(false);//Need clarification from Taro
shipment2.setHALAddress(addrs);//Need clarification from Taro
shipment2.setManifestAction(EnumManifestAction.maRELEASE);//As per taro by default its maRELEASE
shipment2.setConsigneeBillingFlag(false);//As per Taro Not Required
shipment2.setConsigneeBillingFlag(false);//As per Taro Not Required
//shipment2.setShipperReference(ptcn);//As per Taro use PTCN(Pick Ticket Control No)
shipment2.setShipperReference(tranId);
//need to ask
//shipment2.setConsigneeReference(custPord);//As per Taro it is sorder.cust_pord
shipment2.setConsigneeReference(refId);//As per Taro it is sorder.cust_pord
shipment2.setShipperName("Taro Fulfillment");//Needs to change after clarity
shipment2.setTimeInTransit(EnumTimeInTransit.tntFOREVER);//As per taro its tntFOREVER
shipment2.setSaturdayDeliveryFlag(false);//Need to discuss with Taro
System.out.println("Shipment setting completr"+shipment2.getID());
//Adding package to the shipment
/*
sqlSize = "SELECT LENGTH , WIDTH , HEIGHT FROM PACKING WHERE PACK_CODE = (SELECT PACK_CODE FROM CARTON_MASTER WHERE CARTON_NO = ? )";
pstmt2 = conn.prepareStatement(sqlSize);
*/
if("D-ISS".equalsIgnoreCase(refSer.trim()))
{
sqlItem = " SELECT I.HARMONIZATION_DESCR,I.HARMONIZATION_NO,I.HAZARDOUS,L.SHIPPER_SIZE,L.GROSS_WEIGHT,I.COUNT_CODE__MFG,"
+" D.ITEM_CODE FROM DISTORD_ISSDET P,ITEM I,ITEM_LOT_PACKSIZE L, DISTORDER_DET D "
+" WHERE P.TRAN_ID IN(SELECT REF_ID FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) "
+" AND P.CARTON_NO = ? AND P.PALLET_NO = ? AND D.DIST_ORDER = P.DIST_ORDER AND P.LINE_NO_DIST_ORDER = D.LINE_NO "
+" AND I.ITEM_CODE = D.ITEM_CODE AND I.ITEM_CODE = L.ITEM_CODE";
}
else if("C-ISS".equalsIgnoreCase(refSer.trim()))
{
sqlItem =" SELECT I.HARMONIZATION_DESCR,I.HARMONIZATION_NO,I.HAZARDOUS,L.SHIPPER_SIZE,L.GROSS_WEIGHT,I.COUNT_CODE__MFG,P.ITEM_CODE "
+" FROM CONSUME_ISS_DET P,ITEM I,ITEM_LOT_PACKSIZE L "
+" WHERE P.CONS_ISSUE IN(SELECT REF_ID FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) "
+ " AND P.CARTON_NO = ? and P.PALLET_NO = ? "
+" AND I.ITEM_CODE = P.ITEM_CODE AND I.ITEM_CODE = L.ITEM_CODE ";
}
else if("P-RET".equalsIgnoreCase(refSer.trim()))
{
sqlItem = " SELECT I.HARMONIZATION_DESCR,I.HARMONIZATION_NO,I.HAZARDOUS,L.SHIPPER_SIZE,L.GROSS_WEIGHT,I.COUNT_CODE__MFG,P.ITEM_CODE "
+" FROM PORCPDET P,ITEM I,ITEM_LOT_PACKSIZE L "
+" WHERE P.TRAN_ID IN(SELECT REF_ID FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) "
+ " AND P.CARTON_NO = ? and P.PALLET_NO = ? "
+" AND I.ITEM_CODE = P.ITEM_CODE AND I.ITEM_CODE = L.ITEM_CODE ";
}
pstmt3 = conn.prepareStatement(sqlItem);
sqlNoPkg = "SELECT COUNT(*) AS NO_OF_PKG FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ";
pstmt2 = conn.prepareStatement(sqlNoPkg);
pstmt2.setString(1, tranId);
rs2 = pstmt2.executeQuery();
if(rs2.next())
{
noOfPkgs = rs2.getInt("NO_OF_PKG");
}
packgeList = new Package2[noOfPkgs];
infoCom1 = new CommodityInfo[noOfPkgs] ;
System.out.println("noOfPkgs"+noOfPkgs);
//sql = "SELECT COUNT(*) AS NO_OF_PACKAGE FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ";
sql = "SELECT C.CARTON_NO,C.PALLET_NO,D.GROSS_WEIGHT,D.NO_ART,C.LENGTH,C.WIDTH,C.HEIGHT FROM SHIPMENT_CONTENT C,SHIP_DOCS D WHERE C.SHIPMENT_ID = D.SHIPMENT_ID AND"
+" C.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
cartonNo = checkNull(rs.getString("CARTON_NO"));
palleNo = checkNull(rs.getString("PALLET_NO"));
slength = rs.getDouble("LENGTH");
width = rs.getDouble("WIDTH");;
height = rs.getDouble("HEIGHT");
noArt = rs.getDouble("NO_ART");
caseWeight = rs.getDouble("GROSS_WEIGHT");
caseWeightTotal = noArt * caseWeight;
cartonNoList.add(cartonNo);
pkg2 = new Package2();
pkg2.setID(cartonNo);
pkg2.setWeight(caseWeightTotal);
System.out.println("Case total weight"+caseWeightTotal);
strlen = Double.toString(slength);
widthStr =Double.toString(width);
heightStr = Double.toString(height);
System.out.println("strlen"+strlen+"widthStr"+widthStr+"heightStr"+heightStr);
additionalFields[0] = new NameValuePair("carton_no", cartonNo);
pkg2.setDimension(strlen+"x"+widthStr+"x"+heightStr);
System.out.println("Dimension of master package----< :"+pkg2.getDimension());
pkg2.setTrackingNumber("");//Not Required Optional
if(!"".equalsIgnoreCase(pkgDescr.trim()) && pkgDescr.trim().length() > 0)
{
pkg2.setDescription(pkgDescr);//As per Taro
}
else
{
pkg2.setDescription("Pharmaceuticals");
}
pkg2.setOversizeFlag(false);//As per Taro
pkg2.setDeclaredValueFlag(false);//As per Taro
pkg2.setDeclaredValueAmount(0.0);//As per Taro not required
pkg2.setDeclaredValueCustoms(0.0);//As per Taro not required
pkg2.setBillOfLadingComment("");//As per Taro not required
pkg2.setAdditionalHandlingFlag(false);//As per Taro false
pkg2.setPackaging(EnumPackageType.pkgCUSTOM);//As per Taro default pkgCUSTOM
pkg2.setCODFlag(false);//As per Taro false
pkg2.setCODAmount(0.0);//As per Taro not required
pkg2.setCODPaymentType(0);//As per Taro not required
Address addr = new Address();
pkg2.setCODReturnAddress(addr);//As per Taro not required
pkg2.setAdditionalFields(additionalFields);
//setting commdity information.start
pstmt3 = conn.prepareStatement(sqlItem);
pstmt3.setString(1,tranId);
pstmt3.setString(2,cartonNo);
pstmt3.setString(3,palleNo);
rs3 = pstmt3.executeQuery();
while(rs3.next())
{
harmonizDescr = checkNull(rs3.getString("HARMONIZATION_DESCR"));
harmonizCode = checkNull(rs3.getString("HARMONIZATION_NO"));
itemCode = checkNull(rs3.getString("ITEM_CODE"));
//need to check
originCountry = checkNull(rs3.getString("COUNT_CODE__MFG"));
packSizeCase = rs3.getDouble("SHIPPER_SIZE");
caseWeight = rs3.getDouble("GROSS_WEIGHT");
hazardous = checkNull(rs3.getString("HAZARDOUS"));
System.out.println("Enter in while");
if("Y".equalsIgnoreCase(hazardous))
{
pkg2.setHazmatFlag(true);
}
else
{
pkg2.setHazmatFlag(false);
}
pkg2.setCODReturnAddress(addr);//As per Taro not required
comInfo = new CommodityInfo();
//infoCom1 = new CommodityInfo[1] ;
comInfo.setDescription(harmonizDescr);//As per taro Harmonization description
comInfo.setQuantity(noArt * packSizeCase);
//comInfo.setQuantity();
comInfo.setHarmonizedCode(harmonizCode);//As per Taro Haromonization code
//unitValue = 0;//getRateStdoum(saleOrder, itemCode, conn);
if(unitValue > 0)
{
comInfo.setUnitValue(unitValue);
}
else
{
comInfo.setUnitValue(0);
}
comInfo.setUnitWeight(caseWeight);
Country originCountryMfg = soap.getCountry("ISO3", originCountry).getResponseCountry();
comInfo.setOriginCountry(originCountryMfg);
comInfo.setNaftaFlag(false);//False as Per Taro Need To change canda/Mexico as true.
//Calendar calendar1 = Calendar.getInstance();
comInfo.setExportNumberExpireDate(calendar);
comInfo.setUnitOfMeasure(EnumUnitOfMeasure.uomPCS);
System.out.println("comdity info"+comInfo.getDescription());
infoCom1[commCnt] = comInfo;
commCnt++;
System.out.println("Commodity Info List"+infoCom1.toString());
}
if(pstmt3 != null)
{
pstmt3.close();
pstmt3 = null;
}
if(rs3 != null)
{
rs3.close();
rs3 = null;
}
pkg2.setCommodityInfos(infoCom1);
packgeList[pkg]=pkg2;
pkg++;
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if(pstmt2 != null)
{
pstmt2.close();
pstmt2 = null;
}
if(rs2 != null)
{
rs2.close();
rs2 = null;
}
}//if close for refser
//Changed by Rohan on 30-07-13 for generating UPS/FEDEX lable in case of inventory manual shipment.end
//Changed by Rohan on 30-07-13 for generating UPS/FEDEX lable in case of non inventory manual shipment.start
else if("".equalsIgnoreCase(refSer) && refSer.trim().length() <= 0)
{
System.out.println("************Enter in manual shiment for non inventory item ******************************");
sql = "SELECT S.CONSIGNEE_NAME,S.ADDR1,S.ADDR2,S.ADDR3,S.CITY,S.COUNT_CODE,S.STATE_CODE,S.PIN,S.NO_ART,S.PKG_DESCR,S.UNIT_VALUE,S.ITEM_DESCR,S.FRT_LIST "
+" FROM SHIPMENT S WHERE S.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
//custCodeDlv = checkNull(rs.getString("CUST_CODE"));
custName = checkNull(rs.getString("CONSIGNEE_NAME"));
//custShName = checkNull(rs.getString("SH_NAME"));
shipAdd1 = checkNull(rs.getString("ADDR1"));
shipAdd2 = checkNull(rs.getString("ADDR2"));
shipAdd3 = checkNull(rs.getString("ADDR3"));
shipCity = checkNull(rs.getString("CITY"));
shipCountry = checkNull(rs.getString("COUNT_CODE"));
//shipPh = checkNull(rs.getString("TELE1"));
//shipMailId = checkNull(rs.getString("EMAIL_ADDR"));
//shipFax = checkNull(rs.getString("FAX"));
stateCodeDlv = checkNull(rs.getString("STATE_CODE"));
shipPin = checkNull(rs.getString("PIN"));
pkgDescr = checkNull(rs.getString("PKG_DESCR"));
itemDescr = checkNull(rs.getString("ITEM_DESCR"));
unitValue = rs.getDouble("UNIT_VALUE");
noArt = rs.getDouble("NO_ART");
//frtList = checkNull(rs.getString("FRT_LIST"));
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
/*
if(!"".equalsIgnoreCase(frtList) && frtList.trim().length() > 0)
{
sql = "SELECT FRT_TERM FROM FREIGHT_LIST WHERE FRT_LIST = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, frtList);
rs = pstmt.executeQuery();
if(rs.next())
{
frtTerm = checkNull(rs.getString("FRT_TERM"));
}
pstmt.close();pstmt = null;
rs.close();rs = null;
}
*/
shipment2 = new Shipment2();
recipient = new Address();//To set the Address
//Setting Shipment ID
shipment2.setID(refId);
//recipient.setID(custCodeDlv);//Customer Code
recipient.setID(custName);//Customer Code
recipient.setContact(custName);//Customer Name
recipient.setCompany(custName);//Customer Company Name
recipient.setAddress1(shipAdd1);//Customer Adress1
recipient.setAddress2(shipAdd2);//Customer Adress2
recipient.setAddress3(shipAdd3);//Customer Adress3
recipient.setCity(shipCity);//Customer Adress City
sql = "SELECT T.SERVICE_CODE,S.PACK_SIZE FROM SHIPMENT S,TRANSPORTER T WHERE T.TRAN_CODE = S.TRAN_CODE AND"
+" S.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
serviceCode = checkNull(rs.getString("SERVICE_CODE"));
dimensionDouble = rs.getDouble("PACK_SIZE");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
recipient.setState(stateCodeDlv);//Customer Adress State
Country country = soap.getCountry("ISO3", shipCountry).getResponseCountry();
recipient.setCountry(country);//Customer Adress Country
recipient.setPhone(defPh);
recipient.setEMail("");
recipient.setFax("");
recipient.setPostalCode(shipPin);
shipment2.setRecipient(recipient);
service.setFriendlyName(serviceCode);
shipment2.setService(service);
System.out.println("Service name is :"+shipment2.getService());
System.out.println("Service code is :"+serviceCode);
/*
if(!"".equalsIgnoreCase(frtTerm) && frtTerm.trim().length() > 0)
{
shipment2.setTerms(EnumTerms.fromString(frtTerm));
System.out.println("terms::::"+shipment2.getTerms()+"]");
}
else
{
shipment2.setTerms(EnumTerms.trmSHIPPER);
}
*/
shipment2.setTerms(EnumTerms.trmSHIPPER);
//HardCoded valus needs to be change later.
shipment2.setSignatureReleaseFlag(false);//false As per Taro
shipment2.setSignatureRequiredFlag(false);//true Required As per Taro
shipment2.setSaturdayDeliveryFlag(false);// Taro Need To clerify "what is based on service level?"
java.util.Date date = new java.util.Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
shipment2.setShipDate(calendar);
shipment2.setConsigneeAccount("");//Not Required As per Taro
shipment2.setThirdPartyBillingFlag(false);//Not Required As per Taro
shipment2.setThirdPartyBillingAccount("");//Not Required As per Taro
Address addrs = new Address();//Need to capture if required
shipment2.setThirdPartyBillingAddress(addrs);//Not Required As per Taro
shipment2.setHALFlag(false);//Need clarification from Taro
shipment2.setHALAddress(addrs);//Need clarification from Taro
shipment2.setManifestAction(EnumManifestAction.maRELEASE);//As per taro by default its maRELEASE
shipment2.setConsigneeBillingFlag(false);//As per Taro Not Required
shipment2.setConsigneeBillingFlag(false);//As per Taro Not Required
//shipment2.setShipperReference(ptcn);//As per Taro use PTCN(Pick Ticket Control No)
shipment2.setShipperReference(tranId);
//need to ask
//shipment2.setConsigneeReference(custPord);//As per Taro it is sorder.cust_pord
shipment2.setConsigneeReference(refId);//As per Taro it is sorder.cust_pord
shipment2.setShipperName("Taro Fulfillment");//Needs to change after clarity
shipment2.setTimeInTransit(EnumTimeInTransit.tntFOREVER);//As per taro its tntFOREVER
shipment2.setSaturdayDeliveryFlag(false);//Need to discuss with Taro
sqlNoPkg = "SELECT COUNT(*) AS NO_OF_PKG FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ";
pstmt2 = conn.prepareStatement(sqlNoPkg);
pstmt2.setString(1, tranId);
rs2 = pstmt2.executeQuery();
if(rs2.next())
{
noOfPkgs = rs2.getInt("NO_OF_PKG");
}
packgeList = new Package2[noOfPkgs];
infoCom1 = new CommodityInfo[noOfPkgs] ;
//sql = "SELECT COUNT(*) AS NO_OF_PACKAGE FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ";
//sql = "SELECT C.CARTON_NO,C.PALLET_NO,C.GROSS_WEIGHT,S.NO_ART,C.LENGTH,C.WIDTH,C.HEIGHT,S.UNIT_VALUE,S.PKG_DESCR FROM SHIPMENT_CONTENT C,SHIPMENT S WHERE C.SHIPMENT_ID = S.SHIPMENT_ID AND"
// +" C.SHIPMENT_ID = ? ";
sql = "SELECT C.CARTON_NO,C.PALLET_NO,C.GROSS_WEIGHT,C.LENGTH,C.WIDTH,C.HEIGHT FROM SHIPMENT_CONTENT C WHERE C.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
cartonNo = checkNull(rs.getString("CARTON_NO"));
palleNo = checkNull(rs.getString("PALLET_NO"));
slength = rs.getDouble("LENGTH");
width = rs.getDouble("WIDTH");;
height = rs.getDouble("HEIGHT");
//noArt = rs.getDouble("NO_ART");
caseWeight = rs.getDouble("GROSS_WEIGHT");
caseWeightTotal = noArt * caseWeight;
//unitValue = rs.getDouble("UNIT_VALUE");
cartonNoList.add(cartonNo);
//pkgDescr = checkNull(rs.getString("PKG_DESCR"));
pkg2 = new Package2();
pkg2.setID(cartonNo);
pkg2.setWeight(caseWeightTotal);
System.out.println("Case total weight"+caseWeightTotal);
strlen = Double.toString(slength);
widthStr =Double.toString(width);
heightStr = Double.toString(height);
System.out.println("strlen"+strlen+"widthStr"+widthStr+"heightStr"+heightStr);
additionalFields[0] = new NameValuePair("carton_no", cartonNo);
pkg2.setDimension(strlen+"x"+widthStr+"x"+heightStr);
System.out.println("Dimension of master package----< :"+pkg2.getDimension());
pkg2.setTrackingNumber("");//Not Required Optional
if(!"".equalsIgnoreCase(pkgDescr.trim()) && pkgDescr.trim().length() > 0)
{
pkg2.setDescription(pkgDescr);//As per Taro
}
else
{
pkg2.setDescription("Pharmaceuticals");
}
pkg2.setOversizeFlag(false);//As per Taro
pkg2.setDeclaredValueFlag(false);//As per Taro
pkg2.setDeclaredValueAmount(0.0);//As per Taro not required
pkg2.setDeclaredValueCustoms(0.0);//As per Taro not required
pkg2.setBillOfLadingComment("");//As per Taro not required
pkg2.setAdditionalHandlingFlag(false);//As per Taro false
pkg2.setPackaging(EnumPackageType.pkgCUSTOM);//As per Taro default pkgCUSTOM
pkg2.setCODFlag(false);//As per Taro false
pkg2.setCODAmount(0.0);//As per Taro not required
pkg2.setCODPaymentType(0);//As per Taro not required
Address addr = new Address();
pkg2.setCODReturnAddress(addr);//As per Taro not required
pkg2.setAdditionalFields(additionalFields);
//originCountry = checkNull(rs3.getString("COUNT_CODE__MFG"));
pkg2.setHazmatFlag(false);
pkg2.setCODReturnAddress(addr);//As per Taro not required
comInfo = new CommodityInfo();
comInfo.setDescription("");//As per taro Harmonization description
comInfo.setQuantity(noArt);
comInfo.setHarmonizedCode("");//As per Taro Haromonization code
if(unitValue > 0)
{
comInfo.setUnitValue(unitValue);
}
else
{
comInfo.setUnitValue(0);
}
comInfo.setUnitWeight(caseWeight);
Country originCountryMfg = soap.getCountry("ISO3", shipCountry).getResponseCountry();
comInfo.setOriginCountry(originCountryMfg);
comInfo.setNaftaFlag(false);//False as Per Taro Need To change canda/Mexico as true.
//Calendar calendar1 = Calendar.getInstance();
comInfo.setExportNumberExpireDate(calendar);
comInfo.setUnitOfMeasure(EnumUnitOfMeasure.uomPCS);
infoCom1[commCnt] = comInfo;
commCnt++;
pkg2.setCommodityInfos(infoCom1);
packgeList[pkg]=pkg2;
pkg++;
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if(pstmt2 != null)
{
pstmt2.close();
pstmt2 = null;
}
if(rs2 != null)
{
rs2.close();
rs2 = null;
}
}
//Changed by Rohan on 30-07-13 for generating UPS/FEDEX lable in case of non inventory manual shipment.end
if(packgeList.length != 0 || packgeList.length > 0)
{
Timestamp currDate = new Timestamp(System.currentTimeMillis());
shipment2.setPackages2(packgeList);
ShipmentResultReturn2 objReturn2=soap.shipWithLabel(shipment2, ShipWithLabelType.PNG, ImageRotation.Rotation_180);
System.out.println("Is successfully Executed ["+objReturn2.isSuccess()+"]");
System.out.println("Message String ["+objReturn2.getMessage()+"]");
if(!objReturn2.isSuccess())
{
//errString = getError(saleOrder + "[" + objReturn2.getMessage() +"]", "ADSISRVERR", conn);
errString = itmDBAccessLocal.getErrorString("","ADSISRVERR","");
return errString;
}
else
{
//Updating ADSI getting the images.start
ShipmentResult2 objShipResult = objReturn2.getShipmentResultResponse2();
int lenPacakges = objShipResult.getPackageResults2().length;
String value = "";
String pckgId = "";
String trackNo="";
double msnNo=0.0;
String imagePath =null;
imagePath = discommon.getDisparams("999999","SHIP_WITH_PATH",conn);
for(int pCtr = 0;pCtr < lenPacakges;pCtr++)
{
PackageResult2 pkg2frm = (PackageResult2)objShipResult.getPackageResults2()[pCtr];
value = pkg2frm.getBase64Label();
pckgId = pkg2frm.getPackageID();
//change by rekha on 23-05-13.start
pkg2frm.getAdditionalFields();
trackNo=pkg2frm.getTrackingNumber();
cartonNo = cartonNoList.get(pCtr);
System.out.println("cnumber is :"+cartonNo);
System.out.println("Package ID["+pckgId+"]");
System.out.println("Tracking No ["+pkg2frm.getTrackingNumber()+"]");
System.out.println("BASE64lABEL Length["+value.length()+"]");
BASE64Decoder decoder = new BASE64Decoder();
System.out.println("Package id for carton no is :[" +decoder.decodeBuffer(pckgId) +"]");
msnNo = pkg2frm.getMSN();
System.out.println("MSN NO IN EACH PACKAGE IS :" +msnNo);
byte[] imgBytes = decoder.decodeBuffer(value);
System.out.println("IMAGE Byte Length ["+imgBytes.length+"]");
BufferedImage bufImg = ImageIO.read(new ByteArrayInputStream(imgBytes));
File imgOutFile = new File(imagePath+ File.separator+"Manual_Ship_Label"+File.separator+ tranId + File.separator + tranId+"_"+cartonNo +".png");
String path = imgOutFile.getPath();
System.out.println("Get Path ["+path+"]");
File createFolder = new File(path);
if(!createFolder.exists())
{
createFolder.mkdirs();
}
sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ? , SHIP_LABEL= ? , MSN_NO = ? ,STATUS = 'U' "
+ " WHERE CARTON_NO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, trackNo);
pstmt.setString(2, path );
pstmt.setDouble(3, msnNo);
pstmt.setString(4, cartonNo);
System.out.println("carton number in for loop: "+cartonNo);
System.out.println("msn no for pkg result is :" +msnNo);
int updateCnt = pstmt.executeUpdate();
System.out.println("update statement is :"+updateCnt);
if(updateCnt > 0)
{
System.out.println("carton master update succesfully");
}
else
{
System.out.println("Error in carton master updation");
}
//update tracking number in shipment contents.start
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
sql = " UPDATE SHIPMENT_CONTENT SET TRACKING_NO = ? WHERE SHIPMENT_ID = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, trackNo);
pstmt.setString(2,tranId);
pstmt.setInt(3, (pCtr+1));
updateCnt = pstmt.executeUpdate();
System.out.println("update statement is :"+updateCnt);
if(updateCnt > 0)
{
System.out.println("SHIPMENT_CONTENT update succesfully");
}
else
{
System.out.println("Error in SHIPMENT_CONTENTr updation");
}
//update tracking number in shipment contents.end
//update tracking number in pallet number stauas.start
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
sql = " UPDATE PALLET_NO SET STATUS = 'U' WHERE PALLET_NO IN (SELECT PALLET_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? AND LINE_NO = ? )";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
pstmt.setInt(2, (pCtr+1));
updateCnt = pstmt.executeUpdate();
System.out.println("update statement is :"+updateCnt);
if(updateCnt > 0)
{
System.out.println("PALLET_NO update succesfully");
}
else
{
System.out.println("Error in PALLET_NO updation");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
///update tracking number in pallet number stauas.end
///update carton no status in carton no.start
/*
sql = " UPDATE CARTON_MASTER SET STATUS = 'U' WHERE CARTON_NO IN (SELECT CARTON_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? AND LINE_NO = ? )";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
pstmt.setInt(2, (pCtr+1));
updateCnt = pstmt.executeUpdate();
System.out.println("update statement is :"+updateCnt);
if(updateCnt > 0)
{
System.out.println("CARTON_NO update succesfully");
}
else
{
System.out.println("Error in CARTON_NO updation");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
///update carton no status in carton no.end
*/
String n = pkg2frm.getTrackingNumber();
System.out.println("new tracking no of master package :"+n);
double n1 = pkg2.getWeight();
System.out.println("new weight of master package :"+n1);
imgOutFile.createNewFile();
ImageIO.write(bufImg, "png", imgOutFile);
System.out.println("Write File Complete----");
}
OutputStream file = new FileOutputStream(imagePath+ File.separator+"Manual_Ship_Label"+File.separator+ tranId + File.separator + tranId+"_"+"Ship"+".ser" );
OutputStream buffer = new BufferedOutputStream( file );
ObjectOutput output = new ObjectOutputStream( buffer );
output.writeObject(shipment2);
output.flush();
output.close();
file = new FileOutputStream( imagePath+ File.separator+"Manual_Ship_Label"+File.separator+ tranId + File.separator + tranId+"_"+"ShipRslt"+".ser" );
buffer = new BufferedOutputStream( file );
output = new ObjectOutputStream( buffer );
output.writeObject(objReturn2);
output.flush();
output.close();
}
}
else
{
System.out.println("---Packages not set succesfully---");
//errString = itmDBAccessEJB.getErrorString("","ADSISRVERR","","",conn);
errString = itmDBAccessLocal.getErrorString("","VTADSIPKGE","");
return errString;
}
}
else
{
System.out.println("---ADSI Server Not Connected throw error---");
//errString = itmDBAccessEJB.getErrorString("","ADSISRVERR","","",conn);
errString = itmDBAccessLocal.getErrorString("","ADSISRVERR","");
return errString;
}
}
//Changed by Rohna on 22-07-13 for generating UPS/FEDEX lable in case of manual shipment.end
sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ? WHERE SHIPMENT_ID = ?"; sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ? WHERE SHIPMENT_ID = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "Y"); pstmt.setString(1, "Y");
...@@ -297,6 +1315,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -297,6 +1315,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmt = null; pstmt = null;
conn.commit(); conn.commit();
//For Adsi start //For Adsi start
/*comment for further use manual shipment.start /*comment for further use manual shipment.start
DistCommon discommon = new DistCommon(); DistCommon discommon = new DistCommon();
...@@ -365,6 +1384,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -365,6 +1384,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
} }
} }
} }
if( pstmtSord!= null)
{
pstmtSord.close();
pstmtSord = null;
}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -383,6 +1407,12 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -383,6 +1407,12 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
System.out.println("!! Closing Connection in Shipment Confirm() !!"); System.out.println("!! Closing Connection in Shipment Confirm() !!");
try try
{ {
if( pstmtSord!= null)
{
pstmtSord.close();
pstmtSord = null;
}
conn.close(); conn.close();
conn = null; conn = null;
} }
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ adade008
...@@ -111,7 +111,13 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen ...@@ -111,7 +111,13 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
int parentNodeListLength= 0; int parentNodeListLength= 0;
String columnValue = ""; String columnValue = "";
String columnValue1 = "",tranCode=""; String columnValue1 = "",tranCode="";
String sql = ""; String sql = "";
//Chnaged by Rohan on 31-07-13 for define variable.start
String status ="";
String palletNo = "";
String cartonNo = "";
String refId = "";
//Chnaged by Rohan on 31-07-13 for define variable.end
int currentFormNo = 0; int currentFormNo = 0;
long pronoFromAmt = 0; long pronoFromAmt = 0;
long pronoToAmt = 0; long pronoToAmt = 0;
...@@ -549,6 +555,22 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen ...@@ -549,6 +555,22 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
} }
} }
//Changed by sankara on 07-02-13 validations required for state,station country[End...] //Changed by sankara on 07-02-13 validations required for state,station country[End...]
/*
//Changed by Rohan on 30-07-13 for no of pallet must be requried if ref-ser is not S-DSP.start
else if ( childNodeName.equalsIgnoreCase("no_pallet") )
{
columnValue = checkNull(genericUtility.getColumnValue("no_pallet",dom));
refSer = checkNull(genericUtility.getColumnValue("ref_ser",dom2));
if(columnValue == null && columnValue.trim().length() <= 0 && !refSer.equalsIgnoreCase("S-DSP"))
{
errCode = "VTINVPALNO";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
//Changed by Rohan on 30-07-13 for no of pallet must be requried if ref-ser is not S-DSP.end
*/
} }
} }
break; break;
...@@ -918,6 +940,102 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen ...@@ -918,6 +940,102 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
} }
} }
} }
//Changed by Rohan on 22-07-13 to add validation of pallet no should status must be "A".start
/*
case 3 :
{
parentList = dom.getElementsByTagName( "Detail" + currentFormNo );
childList = parentList.item( 0 ).getChildNodes();
noOfChilds = childList.getLength();
for (int ctr = 0; ctr < noOfChilds; ctr++)
{
childNode = childList.item( ctr );
childNodeName = childNode.getNodeName();
if ( childNode != null && childNode.getFirstChild() != null )
{
columnValue = childNode.getFirstChild().getNodeValue();
}
System.out.println(" columnName [" + childNodeName + "] columnValue [" + columnValue + "]");
if ( childNodeName.equalsIgnoreCase("pallet_no") )
{
palletNo = checkNull(genericUtility.getColumnValue("pallet_no", dom));
cartonNo = checkNull(genericUtility.getColumnValue("carton_no", dom));
refSer = checkNull(genericUtility.getColumnValue("ref_ser", dom2));
refId = checkNull(genericUtility.getColumnValue("ref_id", dom2));
System.out.println("Pallet No"+palletNo+"cartonNo"+cartonNo+"refSer"+refSer+"refId"+refId);
if(columnValue == null || columnValue.trim().length() == 0)
{
errList.add( "VTNLPALLET" );
errFields.add( childNodeName.toLowerCase() );
}
else
{
/*
sql = "SELECT STATUS FROM PALLET_NO WHERE PALLET_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, palletNo);
rs = pstmt.executeQuery();
if( rs.next() )
{
status = checkNull(rs.getString("STATUS"));
System.out.println("Status of pallet:::::::::: "+status);
}
System.out.println("Status of pallet::::::>>>>>>>>>:::: "+status);
if((!"".equalsIgnoreCase(status) || status != null ) && !"A".equalsIgnoreCase(status) )
{
errList.add( "VTINVPALET" );
errFields.add( childNodeName.toLowerCase() );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
*/
/*
if((!"".equalsIgnoreCase(refSer) || refSer != null) && ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
{
if("D-ISS".equalsIgnoreCase(refSer.trim()))
{
sql = "SELECT COUNT(*) AS COUNT FROM DISTORD_ISS WHERE TRAN_ID = ? AND PALLET_NO = ? AND CARTON_NO = ?" ;
}
else if("C-ISS".equalsIgnoreCase(refSer.trim()))
{
sql = "SELECT COUNT(*) AS COUNT FROM CONSUME_ISS_DET WHERE CONS_ISSUE = ? AND PALLET_NO = ? AND CARTON_NO = ?" ;
}
else if("P-RET".equalsIgnoreCase(refSer.trim()))
{
sql = "SELECT COUNT(*) AS COUNT FROM PORCPDET WHERE TRAN_ID = ? AND PALLET_NO = ? AND CARTON_NO = ?" ;
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
pstmt.setString(2, palletNo);
pstmt.setString(3, cartonNo);
rs = pstmt.executeQuery();
if( rs.next() )
{
cnt = rs.getInt("COUNT");
}
if(cnt <= 0 )
{
errList.add( "VTINVPNCN" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
}
}
}
*/
//Changed by Rohan on 22-07-13 to add validation of pallet no should status must be "A".start
} }
int errListSize = errList.size(); int errListSize = errList.size();
cnt =0; cnt =0;
...@@ -1091,8 +1209,13 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -1091,8 +1209,13 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
String freightType = ""; String freightType = "";
String reStr = ""; String reStr = "";
String frtTerm = "", prefix = ""; String frtTerm = "", prefix = "";
//Chnaged by Rohan on 30-07-13 for define varable.start
String cartonNo = "";
String palletNo = "";
//Chnaged by Rohan on 30-07-13 for define varable.end
int stdPickUp = 0; int stdPickUp = 0;
int pos = 0; int pos = 0;
//Changed by Rohan on 16-02-13 for change amt from int to double.start //Changed by Rohan on 16-02-13 for change amt from int to double.start
/* /*
int amt1 = 0; int amt1 = 0;
...@@ -2052,6 +2175,37 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -2052,6 +2175,37 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
System.out.println("------------------------COMPLETE DESCRIPTION-------------------"); System.out.println("------------------------COMPLETE DESCRIPTION-------------------");
break; break;
} }
//Changed by Rohan on 30-7-13 for generation carton no and pallet no in itm default.start
case 3:
{
parentNodeList = dom.getElementsByTagName("Detail3");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
valueXmlString.append("<Detail3>");
childNodeListLength = childNodeList.getLength();
do
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
ctr ++;
}while(ctr < childNodeListLength && ! childNodeName.equals(currentColumn));
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
cartonNo = generateCartonNo("w_carton_no_gen",xtraParams,conn);
palletNo = generatePalletNo("w_palletprc",xtraParams,conn);
System.out.println("cartonNo:"+cartonNo+":palletNo:"+palletNo+"]");
valueXmlString.append( "<carton_no><![CDATA[" ).append( checkNull(cartonNo) ).append( "]]></carton_no>\r\n" );
valueXmlString.append( "<pallet_no><![CDATA[" ).append( checkNull(palletNo )).append( "]]></pallet_no>\r\n" );
}
valueXmlString.append( "</Detail3>\r\n" );
break;
}
//Changed by Rohan on 30-7-13 for generation carton no and pallet no in itm default.end
} }
} }
catch(Exception e) catch(Exception e)
...@@ -2351,5 +2505,278 @@ private String checkNull( String input ) ...@@ -2351,5 +2505,278 @@ private String checkNull( String input )
return arryList; return arryList;
} }
//Changed by sumit on 23/01/13 checking duplicate PTCN end. //Changed by sumit on 23/01/13 checking duplicate PTCN end.
private String generateCartonNo(String windowName,String xtraParams,Connection conn)throws Exception
{
String errString = "";
String sql = "",sqlInsert = "";
PreparedStatement pstmt = null,pstmtInsert = null;
ResultSet rs = null;
String chgUser="",chgTerm="",keyString="",tranIDCol="",refSer="";
String xmlString="",tranIDSer="";
int updCnt = 0;
String crtnType = "";
String cartonNumber="";
GenericUtility genericUtility = GenericUtility.getInstance();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
try
{
System.out.println("*****************going for generation oc carton no***************************");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
Timestamp currDate = new Timestamp(System.currentTimeMillis());
xmlString = "<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
"\r\n</header><Detail1>"+
"\r\n<carton_no></carton_no>"+
"</Detail1></Root>";
System.out.println("xmlString : : : : :"+xmlString);
TransIDGenerator tg = new TransIDGenerator(xmlString,"BASE",CommonConstants.DB_NAME);
sql = "SELECT KEY_STRING, TRAN_ID_COL,REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, windowName);
rs = pstmt.executeQuery();
if( rs.next() )
{
keyString = rs.getString( "KEY_STRING" );
tranIDCol = rs.getString("TRAN_ID_COL");
refSer = rs.getString("REF_SER");
}
rs.close();
rs = null;
pstmt.close();
pstmt =null;
keyString = keyString.substring(keyString.indexOf(","));
sqlInsert = "INSERT INTO CARTON_MASTER (CARTON_NO, STATUS, CHG_DATE, CHG_USER, CHG_TERM, " +
" CARTON_TYPE) VALUES (?,?,?,?,?,?) ";
pstmtInsert = conn.prepareStatement(sqlInsert);
tranIDSer = tg.generateTranSeqID(refSer, tranIDCol, keyString, conn);
cartonNumber = getSSCC18("", Integer.parseInt(tranIDSer), conn);
System.out.println("Generated Key :: "+tranIDSer);
if (tranIDSer.indexOf("ERROR") > -1 )
{
errString = itmDBAccessEJB.getErrorString("","VTTRANID","","",conn);
return errString;
}
pstmtInsert.setString(1,cartonNumber);
pstmtInsert.setString(2,"A");
pstmtInsert.setTimestamp(3,currDate);
pstmtInsert.setString(4,chgUser);
pstmtInsert.setString(5,chgTerm);
pstmtInsert.setString(6,"N");
updCnt = pstmtInsert.executeUpdate();
if(updCnt > 0)
{
errString = cartonNumber;
}
if(pstmtInsert != null)
{
pstmtInsert.close();
pstmtInsert = null;
}
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(pstmtInsert != null)
{
pstmtInsert.close();
pstmtInsert = null;
}
}
catch(Exception e)
{
throw new ITMException(e);
}
}
return errString;
}
//Changed by Rohan on 30-7-13 for generation carton no.end
//Changed by Rohan on 30-7-13 for generation pallet no.start
private String generatePalletNo(String windowName,String xtraParams,Connection conn)throws Exception
{
String sSel = "";
String sIns = "";
String cartonID = "";
String palletNo = "";
String printer = "";
String PalletLabel = "";
String keyString = "",refSer = "",tranIDCol = "";
int numCarton = 0;
int numPallet = 0;
int updCnt = 0;
PreparedStatement pSel = null;
PreparedStatement pIns = null;
ResultSet rsSel = null;
//Connection conn = null;
GenericUtility genericUtility = GenericUtility.getInstance();
/*setting LabelType using window name*/
try
{
System.out.println("*****************going for generation of Pallet no***************************");
/*
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);
*/
sSel = "SELECT KEY_STRING, TRAN_ID_COL,REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
pSel = conn.prepareStatement(sSel);
pSel.setString(1, windowName);
rsSel = pSel.executeQuery();
if( rsSel.next() )
{
keyString = rsSel.getString( "KEY_STRING" );
tranIDCol = rsSel.getString("TRAN_ID_COL");
refSer = rsSel.getString("REF_SER");
}
String chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
String chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgTerm");
StringBuffer xmlValues = new StringBuffer("<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>");
xmlValues = xmlValues.append("<Header></Header>");
xmlValues = xmlValues.append("<Detail1>");
if(windowName.trim().equals("w_palletprc"))
{
numPallet = 1;
xmlValues = xmlValues.append("<pallet_no></pallet_no>");
}
xmlValues = xmlValues.append( "</Detail1></Root>");
Timestamp currDate = new Timestamp(System.currentTimeMillis());
TransIDGenerator tg = new TransIDGenerator(xmlValues.toString(), "BASE",CommonConstants.DB_NAME);
sIns = " INSERT INTO PALLET_NO (PALLET_NO,STATUS) VALUES (?,'A') ";
pIns = conn.prepareStatement(sIns);
palletNo = tg.generateTranSeqID(refSer, tranIDCol, keyString, conn);
pIns.setString(1,palletNo);
updCnt = pIns.executeUpdate();
System.out.println(":ROWS INSERTED:["+updCnt+"]");
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if(rsSel != null)
{
rsSel.close();
rsSel = null;
}
if(pIns != null)
{
pIns.close();
pIns = null;
}
if(pSel != null)
{
pSel.close();
pSel = null;
}
}
catch(Exception e)
{
throw new ITMException(e);
}
}
return palletNo ;
}
//Changed by Rohan on 30-7-13 for generation pallet no.start
//Changed by Rohan on 31-07-13 generate SSCC18 complaint number
// 02/08/12 manoharan following method added to generate SSCC18 complaint number
private String getSSCC18(String mfgCode, int runNumber, Connection conn) throws Exception
{
boolean isOdd = false;
int sumOdd = 0, sumEven = 0;
String inputStr = "", sscc18 = "", runNumberStr =""; //mfgCode = "0351672",
//ibase.utility.GenericUtility genUtility = ibase.utility.GenericUtility.getInstance();
int ctr, curDigit = 0, chkDigit = 0, padLen = 0; // runNumber = 4967235
try
{
if (mfgCode == null || mfgCode.length() <= 0)
{
mfgCode = "04";
}
sumOdd = 0;
sumEven = 0;
padLen = 16 - mfgCode.length(); // total length should be 16 excluding extension digit and check digit
runNumberStr = "0000000000000000" + String.valueOf(runNumber);
runNumberStr = runNumberStr.substring(runNumberStr.length() - padLen ,runNumberStr.length());
inputStr = mfgCode + runNumberStr;
System.out.println( " inputStr [" + inputStr + "] inputStr.length() [" + inputStr.length() + "]" );
for (int pos = inputStr.length() - 1; pos >= 0 ; pos--)
{
curDigit = Integer.parseInt(inputStr.substring(pos,pos+1));
System.out.println( " pos [" + pos +"] curDigit [" + curDigit + "]" );
if ( (pos % 2) == 0)
{
sumEven += curDigit;
}
else
{
sumOdd += curDigit;
}
}
// step 1 - multiple odd sum with 3
sumOdd = sumOdd * 3;
chkDigit = 10 - ((sumEven + sumOdd) % 10) ;
if(chkDigit > 9)
{
chkDigit = 0;
}
//System.out.println( " Integer(chkDigit).toString() [" + String.valueOf(chkDigit) +"]" );
//sscc18 =
sscc18 ="0" + inputStr + String.valueOf(chkDigit);
System.out.println(" chkDigit [" + chkDigit + "] sumOdd [" + sumOdd + "] sumEven [" + sumEven + "] inputStr [" + inputStr + "] sscc18 [" + sscc18 +"]" );
}
catch(Exception e){
throw e;
}
return sscc18;
}
} }
\ No newline at end of file
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ adade008
...@@ -46,6 +46,7 @@ import com.adsionline.ADSIShippingWS.StringReturn; ...@@ -46,6 +46,7 @@ import com.adsionline.ADSIShippingWS.StringReturn;
public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLocal, WaveCancelEJBRemote public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLocal, WaveCancelEJBRemote
{ {
HashMap<String,String> replHashMap = new HashMap<String,String>(); HashMap<String,String> replHashMap = new HashMap<String,String>();
HashMap<String,String> manStkReplMap = new HashMap<String,String>();
/** /**
* The public method is used for confirming the service complaint transaction * The public method is used for confirming the service complaint transaction
* Returns confirmation message on successfull confirm otherwise returns error message * Returns confirmation message on successfull confirm otherwise returns error message
...@@ -94,7 +95,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -94,7 +95,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
String lineNoSord = ""; String lineNoSord = "";
//double qtyStduom = 0.0; //double qtyStduom = 0.0;
//double qtyAlloc = 0.0; //double qtyAlloc = 0.0;
PreparedStatement pstmt = null; PreparedStatement pstmt = null,pstmtSord = null;
//Statement stmt = null,stmt1 = null; //Statement stmt = null,stmt1 = null;
//String updateStatus = ""; //String updateStatus = "";
...@@ -108,7 +109,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -108,7 +109,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
//String casePickLoc = ""; //String casePickLoc = "";
//String resrvLoc = ""; //String resrvLoc = "";
//String sqlReplOrd1 = ""; //String sqlReplOrd1 = "";
String sqlSordAlloc = "", sqlSord = "", sqlSordItem = "", line = ""; String sqlSordAlloc = "", sqlSord = "", sqlSordItem = "", line = "",sSQLUpdatSord = "";
DistCommon discommon = new DistCommon(); DistCommon discommon = new DistCommon();
double qtyAlloc = 0d, qtyStduom = 0d; double qtyAlloc = 0d, qtyStduom = 0d;
int updateCnt = 0, retVal = 0, count =0; int updateCnt = 0, retVal = 0, count =0;
...@@ -184,6 +185,19 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -184,6 +185,19 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
String response = ""; String response = "";
String serviceCode = ""; String serviceCode = "";
//Changed by Rohan on 22-01-13 to cancle independent Repanishment.end //Changed by Rohan on 22-01-13 to cancle independent Repanishment.end
String repalnishmentOrd = "";
String repalnishmentline = "";
String sqlMan = "";
PreparedStatement pstmtMan = null;
ResultSet rsMan = null;
String sqlMan1 = "";
PreparedStatement pstmtMan1 = null;
ResultSet rsMan1 = null;
repalnishmentOrd = replOrder;
repalnishmentline = replLineNo;
boolean isManualReplMap = false;
boolean isManualStock = false;
manStkReplMap.clear();
PreparedStatement pstmtTask = null; PreparedStatement pstmtTask = null;
ResultSet rsTask = null; ResultSet rsTask = null;
PreparedStatement pstmtInv = null; PreparedStatement pstmtInv = null;
...@@ -210,6 +224,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -210,6 +224,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
ResultSet rsPick = null; ResultSet rsPick = null;
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
ADSIShippingSoap soap = null; ADSIShippingSoap soap = null;
int updateSorder = 0;
try try
{ {
...@@ -264,6 +279,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -264,6 +279,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
pstmtSql = null; pstmtSql = null;
replHashMap.clear(); replHashMap.clear();
sSQLUpdatSord = "UPDATE SORDER SET SHIP_STATUS = ? WHERE SALE_ORDER = ? AND SHIP_STATUS <> ?";
pstmtSord = conn.prepareStatement(sSQLUpdatSord);
sqlDesp = "SELECT COUNT(*) AS COUNT FROM DESPATCHDET WHERE DESP_ID IN(SELECT REF_ID FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND REF_SER = ?)"; sqlDesp = "SELECT COUNT(*) AS COUNT FROM DESPATCHDET WHERE DESP_ID IN(SELECT REF_ID FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND REF_SER = ?)";
sql = "SELECT REF_SER,REF_ID,PTCN,WAVE_ID FROM WAVE_TASK_DET WHERE WAVE_ID = ?"; sql = "SELECT REF_SER,REF_ID,PTCN,WAVE_ID FROM WAVE_TASK_DET WHERE WAVE_ID = ?";
...@@ -361,7 +379,82 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -361,7 +379,82 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
expLev = checkNull( rsPick.getString("EXP_LEV") ); expLev = checkNull( rsPick.getString("EXP_LEV") );
saleOrder = checkNull( rsPick.getString("SALE_ORDER") ); saleOrder = checkNull( rsPick.getString("SALE_ORDER") );
lineNoSord = checkNull( rsPick.getString("LINE_NO__SORD") ); lineNoSord = checkNull( rsPick.getString("LINE_NO__SORD") );
lineNoSord = " " + lineNoSord;
lineNoSord = lineNoSord.substring(lineNoSord.length()-3);
System.out.println("quantity to Deallocate::::"+quantity); System.out.println("quantity to Deallocate::::"+quantity);
if(!refSer.trim().equalsIgnoreCase("S-DOC") && !refSer.equalsIgnoreCase("RP-PND") && !refSer.equalsIgnoreCase("RP-PSO"))
{
replOrder = checkNull( rsPick.getString("REPL_ORDER") );
replLineNo = checkNull( rsPick.getString("LINE_NO__REPL"));
pickOrder = checkNull( rsPick.getString("PICK_ORDER") );
pickLineNo = checkNull( rsPick.getString("LINE_NO") );
}
else
{
replOrder = checkNull( rsPick.getString("REPL_ORDER") );
replLineNo = checkNull( rsPick.getString("LINE_NO") );
}
//Creating map of repanishment which contains manual repanishment.start
if(!isManualReplMap)
{
System.out.println("*******going for populating Manual Map*************");
sqlMan1 = "SELECT PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmtMan1 = conn.prepareStatement(sqlMan1);
sqlMan = "SELECT REPL_ORDER,LINE_NO__REPL FROM PICK_ORD_DET WHERE (SALE_ORDER,LINE_NO__SORD) IN(SELECT SALE_ORDER,LINE_NO " +
"FROM SORDALLOC WHERE ALLOC_MODE ='M' AND (SALE_ORDER,LINE_NO) IN(SELECT SALE_ORDER,LINE_NO FROM PICK_ORD_DET " +
"WHERE PICK_ORDER IN (SELECT REF_ID FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND REF_SER IN ('C-PICK','M-PICK','A-PICK','P-PICK'))))";
pstmtMan = conn.prepareStatement(sqlMan);
pstmtMan.setString(1,waveID);
rsMan = pstmtMan.executeQuery();
while(rsMan.next())
{
repalnishmentOrd = checkNull(rsMan.getString("REPL_ORDER"));
repalnishmentline = checkNull(rsMan.getString("LINE_NO__REPL"));
System.out.println("Original repalnishmentOrd"+repalnishmentOrd+"repalnishmentline"+repalnishmentline);
if(!"".equalsIgnoreCase(repalnishmentOrd.trim()) && repalnishmentOrd.trim().length() > 0)
{
manStkReplMap.put(repalnishmentOrd.trim()+":"+repalnishmentline.trim(),"M");
System.out.println("Origianl manaula map"+manStkReplMap.toString());
do
{
System.out.println("****** Enter In do *******************");
pstmtMan1.setString(1,repalnishmentOrd);
pstmtMan1.setString(2,repalnishmentline);
rsMan1 = pstmtMan1.executeQuery();
while(rsMan1.next())
{
repalnishmentOrd = checkNull(rsMan1.getString("PICK_ORDER"));
repalnishmentline = checkNull(rsMan1.getString("LINE_NO__PICK"));
if(!"".equalsIgnoreCase(repalnishmentOrd.trim()) && repalnishmentOrd.trim().length() > 0)
{
manStkReplMap.put(repalnishmentOrd.trim()+":"+repalnishmentline.trim(),"M");
}
System.out.println("Afer adding to map depe************["+manStkReplMap.toString());
}
pstmtMan.clearParameters();
pstmtMan.clearParameters();
}
while(!"".equalsIgnoreCase(repalnishmentOrd.trim()) && repalnishmentOrd.trim().length() > 0);
}
}
isManualReplMap = true;
}
System.out.println("Final manual stock Map:::"+manStkReplMap.toString()+"[isManualStock"+isManualStock+"]");
//Creating map of repanishment which contains manual repanishment.end
//Changed by Rohan on 01-08-13 to check sale order line item is manually allocate.If stk is manual allocate then do not deallacate qty for line item.
if(isManualReplMap)
{
isManualStock = isManualAllocStock(saleOrder,lineNoSord,conn);
}
System.out.println("isManualStock:::"+isManualStock);
//Changed by Rohan on 22-01-13 to cancle independent Repanishment.start //Changed by Rohan on 22-01-13 to cancle independent Repanishment.start
/* /*
if(!refSer.trim().equalsIgnoreCase("S-DOC") && !refSer.equalsIgnoreCase("RP-PND") && !refSer.equalsIgnoreCase("RP-PSO")) if(!refSer.trim().equalsIgnoreCase("S-DOC") && !refSer.equalsIgnoreCase("RP-PND") && !refSer.equalsIgnoreCase("RP-PSO"))
...@@ -373,18 +466,20 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -373,18 +466,20 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
*/ */
//Changed by Rohan on 21-03-13 for not call wave Cancellation //Changed by Rohan on 21-03-13 for not call wave Cancellation
System.out.println("Quantity"+quantity+"refSer"+refSer); System.out.println("Quantity"+quantity+"refSer"+refSer);
if(quantity > 0 || !(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))) //Changed by Rohan on 01-08-13 to check sale order line item is manually allocate.If stk is manual allocate then do not deallacate qty for line item.
//if(quantity > 0 || !(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO")))
if((quantity > 0 || !(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))) && !isManualStock)
{ {
if(!refSer.trim().equalsIgnoreCase("S-DOC") && !refSer.equalsIgnoreCase("RP-PND") && !refSer.equalsIgnoreCase("RP-PSO")) /*if(!refSer.trim().equalsIgnoreCase("S-DOC") && !refSer.equalsIgnoreCase("RP-PND") && !refSer.equalsIgnoreCase("RP-PSO"))
{ {
replOrder = checkNull( rsPick.getString("REPL_ORDER") ); replOrder = checkNull( rsPick.getString("REPL_ORDER") );
replLineNo = checkNull( rsPick.getString("LINE_NO__REPL")); replLineNo = checkNull( rsPick.getString("LINE_NO__REPL"));
//Changed by Rohan on 07-02-13 to get original repanishment code.start //Changed by Rohan on 07-02-13 to get original repanishment code.start
/*
//Changed by Rohan on 22-01-13 to cancle independent Repanishment.start //Changed by Rohan on 22-01-13 to cancle independent Repanishment.start
replOrdOrg = replOrder; replOrdOrg = replOrder;
replLineOrg = replLineNo; replLineOrg = replLineNo;
*/
//Changed by Rohan on 22-01-13 to cancle independent Repanishment.end //Changed by Rohan on 22-01-13 to cancle independent Repanishment.end
pickOrder = checkNull( rsPick.getString("PICK_ORDER") ); pickOrder = checkNull( rsPick.getString("PICK_ORDER") );
...@@ -394,7 +489,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -394,7 +489,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
{ {
replOrder = checkNull( rsPick.getString("REPL_ORDER") ); replOrder = checkNull( rsPick.getString("REPL_ORDER") );
replLineNo = checkNull( rsPick.getString("LINE_NO") ); replLineNo = checkNull( rsPick.getString("LINE_NO") );
} }*/
//Changed by Rohan on 07-02-13 to get original repanishment code.start //Changed by Rohan on 07-02-13 to get original repanishment code.start
replOrdOrg = replOrder; replOrdOrg = replOrder;
replLineOrg = replLineNo; replLineOrg = replLineNo;
...@@ -977,7 +1072,24 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -977,7 +1072,24 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
} }
} }
if(!isOrderIsInProcess(saleOrder, ptcn, conn))
{
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .start
pstmtSord.setString(1, "O");
pstmtSord.setString(2, saleOrder);
pstmtSord.setString(3, "C");
updateSorder = pstmtSord.executeUpdate();
if(updateSorder > 0)
{
System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]");
}
pstmtSord.clearParameters();
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
}
}//if close }//if close
//Changed by Rohan on 30-05-13 for void packages duning master pick and parcel picking.end //Changed by Rohan on 30-05-13 for void packages duning master pick and parcel picking.end
...@@ -1009,7 +1121,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -1009,7 +1121,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
} }
//changed by Rohan on 26/03/13 for updating wave status.end //changed by Rohan on 26/03/13 for updating wave status.end
if( pstmtSord!= null)
{
pstmtSord.close();
pstmtSord = null;
}
} }
catch(Exception e) catch(Exception e)
...@@ -1055,6 +1173,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -1055,6 +1173,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
pstmtUpd.close(); pstmtUpd.close();
pstmtUpd = null; pstmtUpd = null;
} }
if( pstmtSord!= null)
{
pstmtSord.close();
pstmtSord = null;
}
if( conn != null && ! conn.isClosed() && connStatus) if( conn != null && ! conn.isClosed() && connStatus)
{ {
conn.close(); conn.close();
...@@ -1384,6 +1507,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -1384,6 +1507,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
ResultSet rs2 = null; ResultSet rs2 = null;
boolean isDepRepl = false; boolean isDepRepl = false;
boolean isPndRepl = false; boolean isPndRepl = false;
boolean isManStk = false;
//Changed by Rohan on 22-01-13 to cancle independent Repanishment.end //Changed by Rohan on 22-01-13 to cancle independent Repanishment.end
//Changed by Rohan on 18-02-13 for checking repanishment confirm.start //Changed by Rohan on 18-02-13 for checking repanishment confirm.start
String sqlReplConf = ""; String sqlReplConf = "";
...@@ -1556,7 +1680,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -1556,7 +1680,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
} }
} }
//Changed by Rohan on 02-08-13 for cheking stock is allocate from manual shipment.start
System.out.println("manStkReplMap"+manStkReplMap.toString()+"replOrdOrg["+replOrdOrg+"]replLineOrg["+replLineOrg+"]");
if(manStkReplMap.containsKey(replOrdOrg.trim()+":"+replLineOrg.trim()))
{
isManStk = true;
System.out.println("************************Manually Stock Allocated************************");
}
//Changed by Rohan on 02-08-13 for cheking stock is allocate from manual shipment.end
if(pstmt1 != null) if(pstmt1 != null)
{ {
pstmt1.close(); pstmt1.close();
...@@ -2424,5 +2555,136 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -2424,5 +2555,136 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
} }
//Changed by Rohan on 30-01-13 to set cancle mode Y in case of stock to dock.end //Changed by Rohan on 30-01-13 to set cancle mode Y in case of stock to dock.end
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .start
private boolean isOrderIsInProcess(String saleOrder,String ptcn,Connection conn) throws ITMException
{
PreparedStatement pstmt = null;
String sql = "";
ResultSet rSet = null;
boolean isOrderIsInProcess = false;
int count = 0;
try
{
sql = "SELECT COUNT(*) from WAVE_TASK W,WAVE_TASK_DET T"
+ " WHERE T.PTCN <> ? "
+ " AND T.SALE_ORDER = ? "
+ " AND W.WAVE_ID = T.WAVE_ID "
+ " AND W.CANCEL <> ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ptcn);
pstmt.setString(2,saleOrder);
pstmt.setString(3,"Y");
rSet = pstmt.executeQuery();
if( rSet.next())
{
count = rSet.getInt(1);
System.out.println("isOrderIsInProcesst==============>>>count["+count+"]");
if(count > 0)
{
return isOrderIsInProcess = true;
}
}
if(rSet != null)
{
rSet.close();
rSet = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
System.out.println("Exception in == >"+e);
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if( rSet != null )
{
rSet.close();
rSet = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
}
catch (Exception e1)
{
throw new ITMException(e1);
}
}
System.out.println("isOrderIsInProcesst==============>>>"+isOrderIsInProcess);
return isOrderIsInProcess;
}
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
private boolean isManualAllocStock(String saleOrder,String lineNoSord,Connection conn) throws ITMException
{
String sql = "";
String sqlShipStanCode = "";
ResultSet rs = null;
PreparedStatement pstmt = null;
boolean isManAlloc = false;
try
{
sql = " SELECT * FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ? AND ALLOC_MODE ='M' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
pstmt.setString(2, lineNoSord);
rs = pstmt.executeQuery();
if (rs.next())
{
isManAlloc = true;
}
}
catch(Exception e)
{
System.out.println("Exception in == >"+e);
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
}
catch (Exception e1)
{
throw new ITMException(e1);
}
}
return isManAlloc;
}
} }
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ adade008
...@@ -218,8 +218,9 @@ etc ...@@ -218,8 +218,9 @@ etc
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " + " FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE " + " AND C.CUST_CODE = S.CUST_CODE " +
" AND C.WAVE_TYPE = W.WAVE_TYPE ";*/ " AND C.WAVE_TYPE = W.WAVE_TYPE ";*/
//Changed By Sankara 02/aug/13 to take single lot from saleorder[WM3DESUN002]
sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," + //sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
" W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+ " W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " + " FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE__DLV " + " AND C.CUST_CODE = S.CUST_CODE__DLV " +
...@@ -378,8 +379,9 @@ etc ...@@ -378,8 +379,9 @@ etc
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " + " FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE " + " AND C.CUST_CODE = S.CUST_CODE " +
" AND C.WAVE_TYPE = W.WAVE_TYPE ";*/ " AND C.WAVE_TYPE = W.WAVE_TYPE ";*/
//Changed By Sankara 02/aug/13 to take single lot from saleorder[WM3DESUN002]
sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," + //sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
" W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+ " W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " + " FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE__DLV " + " AND C.CUST_CODE = S.CUST_CODE__DLV " +
...@@ -922,8 +924,9 @@ etc ...@@ -922,8 +924,9 @@ etc
{ {
columnValue = childNode.getFirstChild().getNodeValue(); columnValue = childNode.getFirstChild().getNodeValue();
} }
//Changed By Sankara as this warning is not required as single lot value has been changed in sales order.start
System.out.println(" columnName [" + childNodeName + "] columnValue [" + columnValue + "]"); System.out.println(" columnName [" + childNodeName + "] columnValue [" + columnValue + "]");
if ( "single_lot".equalsIgnoreCase( childNodeName ) ) /*if ( "single_lot".equalsIgnoreCase( childNodeName ) )
{ {
singleLot = checkNull(genericUtility.getColumnValue( "single_lot", currFormDataDom )); singleLot = checkNull(genericUtility.getColumnValue( "single_lot", currFormDataDom ));
//Changed by sankara on 26-06-13 for customer code as customer code delivery //Changed by sankara on 26-06-13 for customer code as customer code delivery
...@@ -957,8 +960,9 @@ etc ...@@ -957,8 +960,9 @@ etc
pstmt = null; pstmt = null;
} }
} }
} }*/
else if ( "master_pack_allow".equalsIgnoreCase( childNodeName ) ) //Changed By Sankara as this warning is not required as single lot value has been changed in sales order.end
if ( "master_pack_allow".equalsIgnoreCase( childNodeName ) )
{ {
masterPackAllow = checkNull(genericUtility.getColumnValue( "master_pack_allow", currFormDataDom )); masterPackAllow = checkNull(genericUtility.getColumnValue( "master_pack_allow", currFormDataDom ));
parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom )); parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
...@@ -982,12 +986,13 @@ etc ...@@ -982,12 +986,13 @@ etc
//errFields.add( "" ); //errFields.add( "" );
} }
} }
//Changed by sankara on 01/08/13 for both parcel and master allowed for wave start.
if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow)) /*if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
{ {
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
errList.add( "ONSELCMP" ); errList.add( "ONSELCMP" );
} }*/
//Changed by sankara on 01/08/13 for both parcel and master allowed for wave end.
if( rs != null ) if( rs != null )
{ {
...@@ -1025,11 +1030,13 @@ etc ...@@ -1025,11 +1030,13 @@ etc
//errFields.add( "" ); //errFields.add( "" );
} }
} }
if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow)) //Changed by sankara on 01/08/13 for both parcel and master allowed for wave start.
/*if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
{ {
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
errList.add( "ONSELCMP" ); errList.add( "ONSELCMP" );
} }*/
//Changed by sankara on 01/08/13 for both parcel and master allowed for wave end
if( rs != null ) if( rs != null )
{ {
rs.close(); rs.close();
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ adade008
...@@ -46,6 +46,7 @@ import java.util.Collections; ...@@ -46,6 +46,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
...@@ -466,7 +467,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -466,7 +467,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+"(SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY," +"(SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
+"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR," +"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
+"SORDITEM.SITE_CODE,SORDITEM.EXP_LEV, " +"SORDITEM.SITE_CODE,SORDITEM.EXP_LEV, "
+"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012 //Changed by sankara on 01/08/13 single_lot also available in sales order
// +"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
+"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
+" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW " +" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW "
+" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, SORDDET.CONV__QTY_STDUOM " +" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, SORDDET.CONV__QTY_STDUOM "
+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME " +" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME "
...@@ -654,10 +657,36 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -654,10 +657,36 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
pickType = "P"; pickType = "P";
} }
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.start
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn); /*getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
tranCod = (String)getTranInfo.get("TRAN_CODE");*/
if("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow))
{
pickType = "P";
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
if(!pickType.equalsIgnoreCase((String)getTranInfo.get("SHIP_TYPE")))
{
pickType = "M";
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
}
}
else
{
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
}
tranCod = (String)getTranInfo.get("TRAN_CODE"); if(getTranInfo != null & getTranInfo.size() > 0)
{
tranCod = (String)getTranInfo.get("TRAN_CODE");
}
else
{
tranCod = "";
}
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.end
docLocation = getDocLoc(tranCod, conn); docLocation = getDocLoc(tranCod, conn);
pstmtTran = conn.prepareStatement(sqlTran); pstmtTran = conn.prepareStatement(sqlTran);
...@@ -5725,8 +5754,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -5725,8 +5754,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String hazardous = ""; String hazardous = "";
double totActHazVolume = 0.0,totCaseHazVolume = 0.0,totCaseHazWeight = 0.0, totActHazWeight = 0.0,totHazCaseCount = 0.0; double totActHazVolume = 0.0,totCaseHazVolume = 0.0,totCaseHazWeight = 0.0, totActHazWeight = 0.0,totHazCaseCount = 0.0;
ArrayList sordkeyList = new ArrayList(); ArrayList sordkeyList = new ArrayList();
String frmDomMasterPackAllow = "";
String frmDomParcelPackAllow = "";
try try
{ {
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
...@@ -5746,12 +5776,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -5746,12 +5776,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
shipType = genericUtility.getColumnValue("ship_type",headerDom); shipType = genericUtility.getColumnValue("ship_type",headerDom);
pickType = ("Y".equalsIgnoreCase(pickType))?"P":"M";*/ pickType = ("Y".equalsIgnoreCase(pickType))?"P":"M";*/
frmDomMasterPackAllow = checkNull(genericUtility.getColumnValue("master_pack_allow",headerDom));
frmDomParcelPackAllow = checkNull(genericUtility.getColumnValue("parcelpack_allow",headerDom));
if("Y".equalsIgnoreCase(checkNull(genericUtility.getColumnValue("master_pack_allow",headerDom)))) if("Y".equalsIgnoreCase(frmDomMasterPackAllow))
{ {
pickType = "M"; pickType = "M";
} }
else if("Y".equalsIgnoreCase(checkNull(genericUtility.getColumnValue("parcelpack_allow",headerDom)))) else if("Y".equalsIgnoreCase(frmDomParcelPackAllow))
{ {
pickType = "P"; pickType = "P";
} }
...@@ -6128,9 +6160,40 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6128,9 +6160,40 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 02/12/12 to pass the total no cases //Changed By Pragyan 02/12/12 to pass the total no cases
//HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment, conn); //HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment, conn);
//HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment,totCaseCount, conn); //HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment,totCaseCount, conn);
HashMap transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn); //HashMap transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
tranCode = (String)transPorterInfoMap.get("TRAN_CODE"); //Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.start
transMode = (String)transPorterInfoMap.get("TRANS_MODE");
HashMap transPorterInfoMap = null;
if("Y".equalsIgnoreCase(frmDomMasterPackAllow) && "Y".equalsIgnoreCase(frmDomParcelPackAllow))
{
pickType = "P";
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
if(!pickType.equalsIgnoreCase((String)transPorterInfoMap.get("SHIP_TYPE")))
{
pickType = "M";
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
}
}
else
{
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
}
if(transPorterInfoMap != null & transPorterInfoMap.size() > 0)
{
tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
transMode = (String)transPorterInfoMap.get("TRANS_MODE");
}
else
{
tranCode = "";
transMode = "";
}
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.end
if(tranCode == null || tranCode.length() <= 0) if(tranCode == null || tranCode.length() <= 0)
{ {
...@@ -6249,10 +6312,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6249,10 +6312,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(shipment2 != null && shipment2.getPackages2() != null) if(shipment2 != null && shipment2.getPackages2() != null)
{ {
if("P".equalsIgnoreCase(waveMode)) //if("P".equalsIgnoreCase(waveMode))
{ //{
errString = updateTRackingNo(saleOrder, ptcnID, waveId, tranCode, conn); errString = updateTRackingNo(saleOrder, ptcnID, waveId, tranCode, conn);
} //}
shipment2 = null; shipment2 = null;
} }
...@@ -6625,7 +6688,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6625,7 +6688,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
,custName="",custShName = "",shipCity="",shipCountry = "",shipAdd1 = "",shipAdd2 = "", ,custName="",custShName = "",shipCity="",shipCountry = "",shipAdd1 = "",shipAdd2 = "",
shipAdd3 = "",shipPh="",shipFax ="",shipMailId = "",custPord = "",harmonizCode = "",harmonizDescr="",originCountry ="",serviceCode="",pin ="",shipmentType = ""; shipAdd3 = "",shipPh="",shipFax ="",shipMailId = "",custPord = "",harmonizCode = "",harmonizDescr="",originCountry ="",serviceCode="",pin ="",shipmentType = "";
double unitValue = 0.0; double unitValue = 0.0;
LinkedHashMap<String , Double> actCartonWeightMap = new LinkedHashMap<String , Double>();
//Changed By Rekha WM3BSUN006 20/05/13 To get the SOAP connection.end //Changed By Rekha WM3BSUN006 20/05/13 To get the SOAP connection.end
try try
...@@ -6899,7 +6962,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6899,7 +6962,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 31/12/12 for Parcel Pick invStat.equalsIgnoreCase(activePickInv) && //Changed By Pragyan 31/12/12 for Parcel Pick invStat.equalsIgnoreCase(activePickInv) &&
//if("Y".equalsIgnoreCase(mPackAllow) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc))) //if("Y".equalsIgnoreCase(mPackAllow) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
//if(("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc))) //if(("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
if(!invStat.equalsIgnoreCase(activePickInv) && ("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc))) //if(!invStat.equalsIgnoreCase(activePickInv) && ("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
if(!invStat.equalsIgnoreCase(activePickInv) && ("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock)))
{ {
System.out.println("--INSIDE MASTER PACK BLOCK--"); System.out.println("--INSIDE MASTER PACK BLOCK--");
cashCount = Math.floor(quantity /packSize) ; cashCount = Math.floor(quantity /packSize) ;
...@@ -7790,7 +7854,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -7790,7 +7854,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//if(!masterPackAllow && quantity >= packSize && stockToDock.equalsIgnoreCase("N")) //if(!masterPackAllow && quantity >= packSize && stockToDock.equalsIgnoreCase("N"))
//if(("N".equalsIgnoreCase(mPackAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc))) //if(("N".equalsIgnoreCase(mPackAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
//if(("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc))) //if(("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
if(!invStat.equalsIgnoreCase(activePickInv) && ("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc))) //if(!invStat.equalsIgnoreCase(activePickInv) && ("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
if(!invStat.equalsIgnoreCase(activePickInv) && ("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && ("N".equalsIgnoreCase(stockToDock)))
{ {
System.out.println("--INSIDE CASE PACK BLOCK--"); System.out.println("--INSIDE CASE PACK BLOCK--");
...@@ -8026,7 +8091,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -8026,7 +8091,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("--INSIDE ACTIVE*************************** PICK BLOCK--"); System.out.println("--INSIDE ACTIVE*************************** PICK BLOCK--");
//Changed by Rohan on 14/08/12 to create master Pack depending upon wave_task //Changed by Rohan on 14/08/12 to create master Pack depending upon wave_task
//if((quantity < packSize || activeCount > 0) && stockToDock.equalsIgnoreCase("N") ) //if((quantity < packSize || activeCount > 0) && stockToDock.equalsIgnoreCase("N") )
if((quantity < packSize || activeCount > 0) && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)) && "Y".equalsIgnoreCase(aPickAllow)) //if((quantity < packSize || activeCount > 0) && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)) && "Y".equalsIgnoreCase(aPickAllow))
if((quantity < packSize || activeCount > 0) && ("N".equalsIgnoreCase(stockToDock)) && "Y".equalsIgnoreCase(aPickAllow))
{ {
System.out.println("--INSIDE ACTIVE PICK BLOCK--"); System.out.println("--INSIDE ACTIVE PICK BLOCK--");
if(activeCount > 0) if(activeCount > 0)
...@@ -8298,7 +8364,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -8298,7 +8364,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
shipFax = (String)transportInfoMap.get("FAX"); shipFax = (String)transportInfoMap.get("FAX");
custPord = (String)transportInfoMap.get("CUST_PORD"); custPord = (String)transportInfoMap.get("CUST_PORD");
serviceCode = (String)transportInfoMap.get("SERVICE_CODE"); serviceCode = (String)transportInfoMap.get("SERVICE_CODE");
pin = (String)transportInfoMap.get("PIN"); //pin = (String)transportInfoMap.get("PIN");
pin = (String)transportInfoMap.get("DLV_PIN");
shipmentType = (String)transportInfoMap.get("SHIPMENT_TYPE"); shipmentType = (String)transportInfoMap.get("SHIPMENT_TYPE");
//Setting Shipment ID //Setting Shipment ID
shipment2.setID(waveId); shipment2.setID(waveId);
...@@ -10384,6 +10451,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10384,6 +10451,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
int pickCtr = 1; int pickCtr = 1;
double packSizeCase = 0; double packSizeCase = 0;
int cnt = 0; int cnt = 0;
String activeCartonNo = "";
String pickRefId = ""; String pickRefId = "";
//String replRefId =""; //String replRefId ="";
String replRefDeepId = ""; String replRefDeepId = "";
...@@ -10451,8 +10519,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10451,8 +10519,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
mapItemVolume = getItemVoumeMap(itemCode, lotNo, conn); mapItemVolume = getItemVoumeMap(itemCode, lotNo, conn);
//double itemVolume = Math.floor((Double)mapItemVolume.get("ITEM_SIZE")); //double itemVolume = Math.floor((Double)mapItemVolume.get("ITEM_SIZE"));
itemVolume = Math.floor((Double)mapItemVolume.get("ITEM_SIZE")); itemVolume = Math.floor((Double)mapItemVolume.get("ITEM_SIZE"));
//itemVolume = Math.round((Double)mapItemVolume.get("ITEM_SIZE"));
//double itemWeight= Math.floor((Double)mapItemVolume.get("ITEM_WEIGHT")); //double itemWeight= Math.floor((Double)mapItemVolume.get("ITEM_WEIGHT"));
itemWeight= Math.floor((Double)mapItemVolume.get("ITEM_WEIGHT")); itemWeight = Math.floor((Double)mapItemVolume.get("ITEM_WEIGHT"));
//itemWeight= Math.round((Double)mapItemVolume.get("ITEM_WEIGHT"));
packSizeCase = (Double)mapItemVolume.get("PACK_SIZE"); packSizeCase = (Double)mapItemVolume.get("PACK_SIZE");
int refCtr = 1; int refCtr = 1;
...@@ -11685,7 +11755,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11685,7 +11755,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//////////////////////To add Carton no generation for Actives Hear/////////////////////////////////////// //////////////////////To add Carton no generation for Actives Hear///////////////////////////////////////
System.out.println("Finally ["+itemWeightTotal+"]Finally itemVolumeTotal["+itemVolumeTotal+"]"); System.out.println("Finally ["+itemWeightTotal+"]Finally itemVolumeTotal["+itemVolumeTotal+"]");
updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType,""); activeCartonNo = updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType,"");
actCartonWeightMap.put(activeCartonNo, itemWeightTotal);
//Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.start //Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.start
cartonCount++; cartonCount++;
System.out.println("cartonCount:::"+cartonCount+"Active pick case count::"+Integer.parseInt(actPkCnt)); System.out.println("cartonCount:::"+cartonCount+"Active pick case count::"+Integer.parseInt(actPkCnt));
...@@ -11698,7 +11770,220 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11698,7 +11770,220 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
//Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.end //Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.end
} }
if(actCartonWeightMap.size() > 0 && "Y".equalsIgnoreCase(pPickAllow))
{
CommodityInfo[] infoCom = null;
String nafFlag = discommon.getDisparams("999999","NAFTA_FLAG_COUNT",conn);
String sqlQuery = "",sqlSize = "";
double rateStdOum = 0.0;
double shipedQty = 0.0;
double actWeight = 0.0;
double slength = 0;
double width =0;
double height=0;
PreparedStatement pstmt1 = null, pstmt2 = null;
ResultSet rs = null,rs2 = null;
String lotLen=null;
String lotWidth=null;
String lotHeight = null;
int actPkgSize = actCartonWeightMap.size();
int existPackageLen = 0;
Set keySet = actCartonWeightMap.keySet();
Iterator<String> actIteraotor = keySet.iterator();
int Ctr = 0;
sqlQuery = "SELECT ITEM_CODE,SUM(QUANTITY) AS QTY FROM PICK_ORD_DET WHERE CARTON_NO = ? GROUP BY ITEM_CODE";
pstmt1 = conn.prepareStatement(sqlQuery);
sqlSize = "SELECT LENGTH , WIDTH , HEIGHT FROM PACKING WHERE PACK_CODE = (SELECT PACK_CODE FROM CARTON_MASTER WHERE CARTON_NO = ? )";
pstmt2 = conn.prepareStatement(sqlSize);
System.out.println("actPkgSize"+actPkgSize+"[["+actCartonWeightMap.toString()+"]");
//packgeList = new Package2[allMasterListlen];
if(shipment2.getPackages2() != null)
{
existPackageLen = shipment2.getPackages2().length;
}
//packgeList = new Package2[n];
if(existPackageLen > 0)
{
System.out.println("Existing packages1["+existPackageLen+"]"+"N length"+actPkgSize);
Package2[] existPack2 = shipment2.getPackages2();
packgeList = new Package2[actPkgSize + existPackageLen];
for(int pCtr = 0;pCtr < existPackageLen ;pCtr ++)
{
System.out.println("Existing ID["+existPack2[pCtr].getID()+"]pCtr["+pCtr+"]");
packgeList[pCtr] = existPack2[pCtr];
}
}
else
{
System.out.println("Existing packages2["+existPackageLen+"]"+"N lenght"+actPkgSize);
packgeList = new Package2[actPkgSize];
}
while(actIteraotor.hasNext())
{
activeCartonNo = actIteraotor.next();
actWeight = 0.0;
//actWeight = actCartonWeightMap.get(activeCartonNo);
NameValuePair[] additionalFields = new NameValuePair[1];
additionalFields[0] = new NameValuePair("carton_no", activeCartonNo);
pkg2 = new Package2();
pkg2.setID(activeCartonNo);
//pkg2.setWeight(actWeight);
pstmt2.setString(1, activeCartonNo);
rs2 = pstmt2.executeQuery();
if(rs2.next())
{
slength =rs2.getDouble("LENGTH");
width = rs2.getDouble("WIDTH");
height =rs2.getDouble("HEIGHT");
}
pstmt2.clearParameters();
String strlen = ""+slength;
String widthStr = ""+width;
String heightStr = ""+height;
strlen = Double.toString(slength);
widthStr=Double.toString(width);
heightStr = Double.toString(height);
pkg2.setDimension(slength+"x"+widthStr+"x"+heightStr);
System.out.println("Dimension of master package :"+pkg2.getDimension());
//pkg2.setTrackingNumber("");//Not Required Optional
pkg2.setDescription("Pharmaceuticals");//As per Taro
pkg2.setOversizeFlag(false);//As per Taro
pkg2.setDeclaredValueFlag(false);//As per Taro
pkg2.setDeclaredValueAmount(0.0);//As per Taro not required
pkg2.setDeclaredValueCustoms(0.0);//As per Taro not required
pkg2.setBillOfLadingComment("");//As per Taro not required
pkg2.setAdditionalHandlingFlag(false);//As per Taro false
pkg2.setPackaging(EnumPackageType.pkgCUSTOM);//As per Taro default pkgCUSTOM
pkg2.setCODFlag(false);//As per Taro false
pkg2.setCODAmount(0.0);//As per Taro not required
pkg2.setCODPaymentType(0);//As per Taro not required
Address addr = new Address();
pkg2.setCODReturnAddress(addr);//As per Taro not required
pkg2.setAdditionalFields(additionalFields);
pstmt1.setString(1, activeCartonNo);
rs = pstmt1.executeQuery();
HashMap tempImap = new HashMap();
while(rs.next())
{
itemCode = rs.getString("ITEM_CODE");
shipedQty = rs.getDouble("QTY");
tempImap.put(itemCode, shipedQty);
}
int tempSize = tempImap.size();
infoCom = new CommodityInfo[tempSize];
Iterator itM = tempImap.keySet().iterator();
int commCtr = 0;
while(itM.hasNext())
{
itemCode = (String)itM.next();
shipedQty = (Double)tempImap.get(itemCode);
itmVolumeMap = getItemVoumeMap(itemCode,"",conn);
packSizeCase = (Double)itmVolumeMap.get("PACK_SIZE");
perItemVolume = (Double)itmVolumeMap.get("ITEM_SIZE");
caseVolume = (Double)itmVolumeMap.get("LOT_SIZE");
caseWeight = (Double)itmVolumeMap.get("PACK_WEIGHT");
itemWeight = (Double)itmVolumeMap.get("ITEM_WEIGHT");
hazardous = (String)itmVolumeMap.get("HAZARDOUS");
harmonizCode = (String)itmVolumeMap.get("HARMONIZATION_NO");
harmonizDescr = (String)itmVolumeMap.get("HARMONIZATION_DESCR");
originCountry = (String)itmVolumeMap.get("ORIGIN_COUNTRY");
unitValue = getRateStdoum(saleOrder, itemCode, conn);
System.out.println("shipedQty["+shipedQty+"]");
actWeight = actWeight + itemWeight * shipedQty;
if("Y".equalsIgnoreCase(hazardous))
{
pkg2.setHazmatFlag(true);
}
else
{
pkg2.setHazmatFlag(false);
}
comInfo = new CommodityInfo();
comInfo.setDescription(harmonizDescr);//As per taro Harmonization description
comInfo.setQuantity(shipedQty);
comInfo.setHarmonizedCode(harmonizCode);//As per Taro Haromonization code
comInfo.setUnitValue(unitValue);
comInfo.setUnitWeight(itemWeight);
Country originCountryMfg = soap.getCountry("ISO3", originCountry).getResponseCountry();
comInfo.setOriginCountry(originCountryMfg);
System.out.println("VALUES IN NAFTA VALUES "+nafFlag);
if(nafFlag.indexOf(shipCountry) != -1)
{
comInfo.setNaftaFlag(true);
System.out.println("available in disparm");
}
else
{
System.out.println("not in disparm");
comInfo.setNaftaFlag(false);//False as Per Taro Need To change canda/Mexico as true.
}
Calendar calendar = Calendar.getInstance();
comInfo.setExportNumberExpireDate(calendar);
comInfo.setUnitOfMeasure(EnumUnitOfMeasure.uomPCS);
infoCom[commCtr] = comInfo;
commCtr++;
}
System.out.println("Total Active Weight ["+actWeight+"]");
pkg2.setWeight(actWeight);
pkg2.setCommodityInfos(infoCom);
System.out.println("Ctr"+Ctr+"existPackageLen"+existPackageLen+"]");
packgeList[Ctr + existPackageLen] = pkg2;
Ctr++;
}
if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt2 != null)
{
pstmt2.close();
pstmt2 = null;
}
if(rs2 != null)
{
rs2.close();
rs2 = null;
}
}
} }
//change by rekha on 23-05-13 start //change by rekha on 23-05-13 start
...@@ -11706,7 +11991,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11706,7 +11991,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//if("P".equalsIgnoreCase(waveMode) && packgeList != null && packgeList.length > 0) //if("P".equalsIgnoreCase(waveMode) && packgeList != null && packgeList.length > 0)
if(packgeList != null && packgeList.length > 0) if(packgeList != null && packgeList.length > 0)
{ {
System.out.println("Setting Packages To Shipment ["+packgeList.toString()+"]");
shipment2.setPackages2(packgeList); shipment2.setPackages2(packgeList);
/*BASE64Decoder decoder = new BASE64Decoder(); /*BASE64Decoder decoder = new BASE64Decoder();
Timestamp currDate = new Timestamp(System.currentTimeMillis()); Timestamp currDate = new Timestamp(System.currentTimeMillis());
...@@ -12141,7 +12426,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12141,7 +12426,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by sumit sarkar on 26/08/2011 [ WM1ESUN006 ] update pick_ord_hrd & pick_ord_det table end. //Changed by sumit sarkar on 26/08/2011 [ WM1ESUN006 ] update pick_ord_hrd & pick_ord_det table end.
private String updateTRackingNo(String saleOrder,String ptcn,String waveID,String tranCode,Connection conn) private String updateTRackingNo(String saleOrder,String ptcn,String waveID,String tranCode,Connection conn)throws Exception
{ {
String errString = ""; String errString = "";
...@@ -12189,14 +12474,41 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12189,14 +12474,41 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
try try
{ {
Timestamp currDate = new Timestamp(System.currentTimeMillis());
tranId = getTranId("w_wave_stat_org", conn);
sqlInsertData = "INSERT INTO WAVE_STATUS_ORG (TRAN_ID, WAVE_ID,TRAN_CODE,PTCN,CHG_USER,CHG_DATE,CHG_TERM,PRINT_STATUS,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME)"+
" VALUES (?,?,?,?,?,?,?,?,?,?)";
pstmtInsertData = conn.prepareStatement(sqlInsertData);
pstmtInsertData.setString(1,tranId);
pstmtInsertData.setString(2,waveID);
pstmtInsertData.setString(3,tranCode);
pstmtInsertData.setString(4,ptcn);
pstmtInsertData.setString(5,chgUser);
pstmtInsertData.setTimestamp(6,currDate);
pstmtInsertData.setString(7,chgTerm);
pstmtInsertData.setString(8,"Y");
pstmtInsertData.setString(9,carrierSymbol);
pstmtInsertData.setString(10,carrierFriendlyName);
//Chnaged by sumit on 03/04/12
pstmtInsertData.addBatch();
pstmtInsertData.executeBatch();
if("P".equalsIgnoreCase(waveMode))
{
imagePath = discommon.getDisparams("999999","SHIP_WITH_PATH",conn); imagePath = discommon.getDisparams("999999","SHIP_WITH_PATH",conn);
BASE64Decoder decoder = new BASE64Decoder(); BASE64Decoder decoder = new BASE64Decoder();
Timestamp currDate = new Timestamp(System.currentTimeMillis()); //Timestamp currDate = new Timestamp(System.currentTimeMillis());
ShipmentResultReturn2 objReturn2 = soap.shipWithLabel(shipment2, ShipWithLabelType.PNG, ImageRotation.Rotation_Default); ShipmentResultReturn2 objReturn2 = soap.shipWithLabel(shipment2, ShipWithLabelType.PNG, ImageRotation.Rotation_Default);
ShipmentResult2 objShipResult = objReturn2.getShipmentResultResponse2(); ShipmentResult2 objShipResult = objReturn2.getShipmentResultResponse2();
int lenPacakges = objShipResult.getPackageResults2().length; System.out.println("Is successfully Executed ["+objReturn2.isSuccess()+"]");
System.out.println("Is successfully Executed ["+objReturn2.isSuccess()+"]");
System.out.println("Message String ["+objReturn2.getMessage()+"]"); System.out.println("Message String ["+objReturn2.getMessage()+"]");
if(!objReturn2.isSuccess()) if(!objReturn2.isSuccess())
{ {
...@@ -12205,6 +12517,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12205,6 +12517,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
else else
{ {
int lenPacakges = objShipResult.getPackageResults2().length;
serviceSymbol = objShipResult.getServiceSymbol(); serviceSymbol = objShipResult.getServiceSymbol();
System.out.println("serviceSymbol["+serviceSymbol+"]"); System.out.println("serviceSymbol["+serviceSymbol+"]");
carrierSymbol = serviceSymbol.substring(0,serviceSymbol.lastIndexOf(".") ); carrierSymbol = serviceSymbol.substring(0,serviceSymbol.lastIndexOf(".") );
...@@ -12325,7 +12639,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12325,7 +12639,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//String windowName="w_wave_stat_org"; //String windowName="w_wave_stat_org";
tranId = getTranId("w_wave_stat_org", conn); /*tranId = getTranId("w_wave_stat_org", conn);
sqlInsertData = "INSERT INTO WAVE_STATUS_ORG (TRAN_ID, WAVE_ID,TRAN_CODE,PTCN,CHG_USER,CHG_DATE,CHG_TERM,PRINT_STATUS,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME)"+ sqlInsertData = "INSERT INTO WAVE_STATUS_ORG (TRAN_ID, WAVE_ID,TRAN_CODE,PTCN,CHG_USER,CHG_DATE,CHG_TERM,PRINT_STATUS,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME)"+
" VALUES (?,?,?,?,?,?,?,?,?,?)"; " VALUES (?,?,?,?,?,?,?,?,?,?)";
pstmtInsertData = conn.prepareStatement(sqlInsertData); pstmtInsertData = conn.prepareStatement(sqlInsertData);
...@@ -12343,7 +12657,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12343,7 +12657,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Chnaged by sumit on 03/04/12 //Chnaged by sumit on 03/04/12
pstmtInsertData.addBatch(); pstmtInsertData.addBatch(); */
sqlInsertDt = "SELECT CARTON_NO,PICK_ORDER,LINE_NO__PICK,CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE,TRACKING_NO,SHIP_LABEL FROM CARTON_MASTER WHERE PTCN = ? ORDER BY ITEM_CODE"; sqlInsertDt = "SELECT CARTON_NO,PICK_ORDER,LINE_NO__PICK,CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE,TRACKING_NO,SHIP_LABEL FROM CARTON_MASTER WHERE PTCN = ? ORDER BY ITEM_CODE";
...@@ -12418,16 +12732,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12418,16 +12732,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtInsertData.executeBatch(); //pstmtInsertData.executeBatch();
pstmtInsertData1.executeBatch(); pstmtInsertData1.executeBatch();
pstmtInsertData.clearParameters(); pstmtInsertData.clearParameters();
pstmtInsertData1.clearParameters(); pstmtInsertData1.clearParameters();
if( pstmtInsertData != null) /*if( pstmtInsertData != null)
{ {
pstmtInsertData.close(); pstmtInsertData.close();
pstmtInsertData = null; pstmtInsertData = null;
} }*/
if( pstmtInsertData1 != null) if( pstmtInsertData1 != null)
{ {
...@@ -12437,14 +12751,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12437,14 +12751,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
}
if( pstmtInsertData != null)
{
pstmtInsertData.close();
pstmtInsertData = null;
}
} }
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
throw e;
} }
finally finally
{ {
...@@ -12465,6 +12783,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12465,6 +12783,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
throw e;
} }
} }
...@@ -15678,7 +15997,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -15678,7 +15997,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
stanCodeFrm = (String)stationInfoMap.get("STAN_CODE"); stanCodeFrm = (String)stationInfoMap.get("STAN_CODE");
stateCodeFrm = (String)stationInfoMap.get("STATE_CODE"); stateCodeFrm = (String)stationInfoMap.get("STATE_CODE");
pinFrm = getPinSite(siteCodeShip,conn); pinFrm = getPinSite(siteCodeShip,conn);
pinTo = getPinCust(custCodeDlv,conn); //pinTo = getPinCust(custCodeDlv,conn);
pinTo = (String)stationInfoMap.get("DLV_PIN");
if(("P".equalsIgnoreCase(pickType) && "P".equalsIgnoreCase(shipType)) || ("M".equalsIgnoreCase(pickType) && "M".equalsIgnoreCase(shipType)) )//|| "".equalsIgnoreCase(shipType) || "L".equalsIgnoreCase(shipType)) if(("P".equalsIgnoreCase(pickType) && "P".equalsIgnoreCase(shipType)) || ("M".equalsIgnoreCase(pickType) && "M".equalsIgnoreCase(shipType)) )//|| "".equalsIgnoreCase(shipType) || "L".equalsIgnoreCase(shipType))
{ {
...@@ -16090,7 +16410,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16090,7 +16410,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String custCode = "",stanCode = "",siteCodeShip = "",stateCodeDlv = "",shipConsGrp = "" String custCode = "",stanCode = "",siteCodeShip = "",stateCodeDlv = "",shipConsGrp = ""
//Changed By Rekha to get additional fields for ADSI //Changed By Rekha to get additional fields for ADSI
,custName="",custShName = "",shipCity="",shipCountry = "",shipAdd1 = "",shipAdd2 = "",shipAdd3 = "", ,custName="",custShName = "",shipCity="",shipCountry = "",shipAdd1 = "",shipAdd2 = "",shipAdd3 = "",
shipPh="",shipFax ="",shipMailId = "",custPord = ""; shipPh="",shipFax ="",shipMailId = "",custPord = "",dlvPin = "";
try try
{ {
...@@ -16103,7 +16423,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16103,7 +16423,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
/*sql = "SELECT C.CUST_CODE AS CUST_CODE,C.STAN_CODE AS STAN_CODE,S.SITE_CODE__SHIP AS SHIP_CODE,C.STATE_CODE AS STATE_DLV,C.SHIP_CONS_GRP AS SHIP_CONS_GRP FROM SORDER S,CUSTOMER C " /*sql = "SELECT C.CUST_CODE AS CUST_CODE,C.STAN_CODE AS STAN_CODE,S.SITE_CODE__SHIP AS SHIP_CODE,C.STATE_CODE AS STATE_DLV,C.SHIP_CONS_GRP AS SHIP_CONS_GRP FROM SORDER S,CUSTOMER C "
+ " WHERE S.CUST_CODE__DLV = C.CUST_CODE " + " WHERE S.CUST_CODE__DLV = C.CUST_CODE "
+ " AND S.SALE_ORDER = ? ";*/ + " AND S.SALE_ORDER = ? ";*/
sql = "SELECT C.CUST_CODE AS CUST_CODE," /*sql = "SELECT C.CUST_CODE AS CUST_CODE,"
+" C.STAN_CODE AS STAN_CODE," +" C.STAN_CODE AS STAN_CODE,"
+" S.SITE_CODE__SHIP AS SHIP_CODE," +" S.SITE_CODE__SHIP AS SHIP_CODE,"
+" S.CUST_PORD AS CUST_PORD," +" S.CUST_PORD AS CUST_PORD,"
...@@ -16121,7 +16441,28 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16121,7 +16441,28 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+" C.EMAIL_ADDR AS EMAIL_ID" +" C.EMAIL_ADDR AS EMAIL_ID"
+" FROM SORDER S,CUSTOMER C " +" FROM SORDER S,CUSTOMER C "
+ " WHERE S.CUST_CODE__DLV = C.CUST_CODE " + " WHERE S.CUST_CODE__DLV = C.CUST_CODE "
+ " AND S.SALE_ORDER = ? "; + " AND S.SALE_ORDER = ? ";*/
sql = " SELECT S.CUST_CODE__DLV AS CUST_CODE,"
+" S.STAN_CODE AS STAN_CODE,"
+" S.SITE_CODE__SHIP AS SHIP_CODE,"
+" S.CUST_PORD AS CUST_PORD,"
+" S.STATE_CODE__DLV AS STATE_DLV,"
+" C.SHIP_CONS_GRP AS SHIP_CONS_GRP,"
+" S.DLV_TO AS CUST_NAME,"
+" C.SH_NAME AS SH_NAME,"
+" S.DLV_ADD1 AS ADDR1,"
+" S.DLV_ADD2 AS ADDR2,"
+" S.DLV_ADD3 AS ADDR3,"
+" S.DLV_CITY AS CITY,"
+" S.COUNT_CODE__DLV AS COUNT_CODE,"
+" S.TEL1__DLV AS PHONE,"
+" S.FAX__DLV AS FAX,"
+" C.EMAIL_ADDR AS EMAIL_ID,"
+" S.DLV_PIN AS DLV_PIN"
+" FROM SORDER S,CUSTOMER C"
+" WHERE S.CUST_CODE__DLV = C.CUST_CODE "
+" AND S.SALE_ORDER = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder); pstmt.setString(1,saleOrder);
...@@ -16145,6 +16486,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16145,6 +16486,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
shipMailId = rs.getString("EMAIL_ID"); shipMailId = rs.getString("EMAIL_ID");
shipFax = rs.getString("FAX"); shipFax = rs.getString("FAX");
custPord = rs.getString("CUST_PORD"); custPord = rs.getString("CUST_PORD");
dlvPin = rs.getString("DLV_PIN");
} }
sordInfoMap.put("CUST_CODE", custCode); sordInfoMap.put("CUST_CODE", custCode);
...@@ -16162,7 +16504,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16162,7 +16504,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
sordInfoMap.put("EMAIL_ID", shipMailId); sordInfoMap.put("EMAIL_ID", shipMailId);
sordInfoMap.put("FAX", shipFax); sordInfoMap.put("FAX", shipFax);
sordInfoMap.put("CUST_PORD", custPord); sordInfoMap.put("CUST_PORD", custPord);
sordInfoMap.put("DLV_PIN", dlvPin);
if(shipConsGrp != null && shipConsGrp.length() > 0 ) if(shipConsGrp != null && shipConsGrp.length() > 0 )
{ {
...@@ -16172,7 +16514,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16172,7 +16514,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
sordInfoMap.put("SHIP_CONS_GRP", custCode); sordInfoMap.put("SHIP_CONS_GRP", custCode);
} }
sordInfoMap.put("CUST_PORD", custPord);
if( rs != null ) if( rs != null )
{ {
...@@ -18916,18 +19258,24 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -18916,18 +19258,24 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by sumit on 23/08/12n update wave_status as per their sequence of task start. //Changed by sumit on 23/08/12n update wave_status as per their sequence of task start.
private String updateWaveSatus(String waveId,String directPickLoc, Connection conn) throws ITMException private String updateWaveSatus(String waveId,String directPickLoc, Connection conn) throws ITMException
{ {
PreparedStatement pstmt2 = null, pstmt = null, pstmt1 = null; PreparedStatement pstmt2 = null, pstmt = null, pstmt1 = null,pstmtSord = null;
ResultSet rs2 = null, rs3 = null, rs1 = null; ResultSet rs2 = null, rs3 = null, rs1 = null,rsSord = null;
String refSer = ""; String refSer = "";
String refId = ""; String refId = "";
String tempOrder = ""; String tempOrder = "";
String saleOrder = ""; String saleOrder = "";
String sql1 = ""; String sql1 = "",sSQLUpdatSord = "";
String errString = ""; String errString = "";
int update = 0; int update = 0;
int updateSorder = 0;
try try
{ {
sSQLUpdatSord = "UPDATE SORDER SET SHIP_STATUS = ? WHERE SALE_ORDER = ?";
pstmtSord = conn.prepareStatement(sSQLUpdatSord);
//Changed by sumit on 30/07/12 giving input START. //Changed by sumit on 30/07/12 giving input START.
sql = "SELECT REF_SER, REF_ID, SALE_ORDER FROM WAVE_TASK_DET WHERE WAVE_ID = ? "; sql = "SELECT REF_SER, REF_ID, SALE_ORDER FROM WAVE_TASK_DET WHERE WAVE_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -19252,6 +19600,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -19252,6 +19600,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
} }
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .start
pstmtSord.setString(1, "P");
pstmtSord.setString(2, saleOrder);
updateSorder = pstmtSord.executeUpdate();
if(updateSorder > 0)
{
System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]");
}
pstmtSord.clearParameters();
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
} }
if( pstmt != null ) if( pstmt != null )
{ {
...@@ -19274,6 +19635,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -19274,6 +19635,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
rs3 = null; rs3 = null;
} }
//Changed by sumit on 30/07/12 giving input END. //Changed by sumit on 30/07/12 giving input END.
if( pstmtSord!= null)
{
pstmtSord.close();
pstmtSord = null;
}
} }
catch(Exception e) catch(Exception e)
{ {
......
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