Skip to content

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

Issue Tracker No 74 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92612 ce508802-f39f-4f6c-b175-0d175dae99d5
parent af9f04b6
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 14 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 956990a1
...@@ -244,6 +244,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -244,6 +244,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by sumit 22/08/12 to retrieve alloc_flag start. //Changed by sumit 22/08/12 to retrieve alloc_flag start.
PreparedStatement pstmt1 = null; PreparedStatement pstmt1 = null;
ResultSet rs2 = null; ResultSet rs2 = null;
//Changed By Pragyan
String shipType = "";
//Changed by sumit 22/08/12 to retrieve alloc_flag end. //Changed by sumit 22/08/12 to retrieve alloc_flag end.
//Changed by Sankara on 23/11/12 fir dispalying get data in propar format //Changed by Sankara on 23/11/12 fir dispalying get data in propar format
retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" + retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
...@@ -730,7 +732,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -730,7 +732,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
getTranInfo = new HashMap(); getTranInfo = new HashMap();
saleOrderTran = rs.getString("SALE_ORDER"); saleOrderTran = rs.getString("SALE_ORDER");
//getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty, conn); //getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty, conn);
getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty,noArt, conn); getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty,noArt,shipType, conn);
tranCod = (String)getTranInfo.get("TRAN_CODE"); tranCod = (String)getTranInfo.get("TRAN_CODE");
docLocation = getDocLoc(tranCod, conn); docLocation = getDocLoc(tranCod, conn);
...@@ -3609,6 +3611,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3609,6 +3611,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
double totalWeightCurrentshipment = 0.0; double totalWeightCurrentshipment = 0.0;
double totActVolume = 0.0,totCaseVolume = 0.0,totCaseWeight = 0.0, totActWeight = 0.0,totCaseCount = 0.0; double totActVolume = 0.0,totCaseVolume = 0.0,totCaseWeight = 0.0, totActWeight = 0.0,totCaseCount = 0.0;
//Changed By Pragyan start
String sqlLocInv = "";
String mPackAllow = "";
String aPickAllow = "";
String stockToDoc = "";
String pPickAllow = "";
String shipType = "";
//Changed By Pragyan End
try try
{ {
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
...@@ -3622,6 +3634,41 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3622,6 +3634,41 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
dueDateFrom = genericUtility.getValidDateString(dueDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); dueDateFrom = genericUtility.getValidDateString(dueDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
dueDateTo = genericUtility.getValidDateString(dueDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); dueDateTo = genericUtility.getValidDateString(dueDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
//Changed By Pragyan 30/01/13 To get the master pick location Start
mPackAllow = genericUtility.getColumnValue("master_pack_allow",headerDom);
mPackAllow = (mPackAllow != null && mPackAllow.length() > 0)?mPackAllow:"N";
aPickAllow = genericUtility.getColumnValue("active_pick_allow",headerDom);
aPickAllow = (aPickAllow != null && aPickAllow.length() > 0)?aPickAllow:"Y";
stockToDoc = genericUtility.getColumnValue("stock_to_dock_allow",headerDom);
stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y";
pPickAllow = genericUtility.getColumnValue("parcelpack_allow",headerDom);
pPickAllow = (pPickAllow != null && pPickAllow.length() > 0)?pPickAllow:"Y";
shipType = genericUtility.getColumnValue("ship_type",headerDom);
/*if("A".equalsIgnoreCase(shipmentType))
{
}
else if("L".equalsIgnoreCase(shipmentType) && ( "Y".equalsIgnoreCase(mPackAllow)))
{
shipmentType = "M";
}
else if("L".equalsIgnoreCase(shipmentType) && ( "Y".equalsIgnoreCase(mPackAllow)))
{
shipmentType = "M";
}
else if("M".equalsIgnoreCase(shipmentType) && "Y".equalsIgnoreCase(mPackAllow))
{
shipmentType = "L";
}
else if("P".equalsIgnoreCase(shipmentType) && "Y".equalsIgnoreCase(pPickAllow))
{
shipmentType = "L";
}*/
System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]shipmentType["+shipType+"]");
//Changed By Pragyan 30/01/13 To get the master pick location.End
System.out.println("Current Size of The Map.......................["+saleOrderWiseMap.size()+"]"); System.out.println("Current Size of The Map.......................["+saleOrderWiseMap.size()+"]");
if(saleOrderWiseMap != null && saleOrderWiseMap.size() >0) if(saleOrderWiseMap != null && saleOrderWiseMap.size() >0)
...@@ -3904,13 +3951,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3904,13 +3951,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("Final weight for th shipment "+totalWeightCurrentshipment+"]totCaseWeight"+totCaseWeight+"]totCaseVolume["+totCaseVolume); System.out.println("Final weight for th shipment "+totalWeightCurrentshipment+"]totCaseWeight"+totCaseWeight+"]totCaseVolume["+totCaseVolume);
//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,shipType, conn);
tranCode = (String)transPorterInfoMap.get("TRAN_CODE"); tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
transMode = (String)transPorterInfoMap.get("TRANS_MODE"); transMode = (String)transPorterInfoMap.get("TRANS_MODE");
if(tranCode == null || tranCode.length() <= 0) if(tranCode == null || tranCode.length() <= 0)
{ {
return errString = getError(saleOrder + " Total Weight["+totalWeightCurrentshipment+"] Total Case Count ["+totCaseCount+"] ", "NVLTRANCOD", conn); //return errString = getError("", "NVLTRANCOD", conn);
return errString = itmDBAccessEJB.getErrorString("","NVLTRANCOD","","",conn);
} }
//Changed By Pragyan 26/12/12/ To send the List with ordered Location //Changed By Pragyan 26/12/12/ To send the List with ordered Location
...@@ -10947,7 +10995,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10947,7 +10995,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.
*/ //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$-PICKING LOGIC CHANGE.START */ //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$-PICKING LOGIC CHANGE.START
private String updatePickOrdPartII(Document headerDom, Document detailDom,String waveID,String siteCode,String saleOrder, String xtraParams, ArrayList dataList,String ptcn,HashMap transportInfoMap,double totActVolume,double totActWeight,double totCaseVolume,double totCaseWeight,double totCaseCount, Connection conn )throws Exception private String updatePickOrdPartII(Document headerDom, Document detailDom,String waveID,String siteCode,String saleOrder, String xtraParams, ArrayList dataList,String ptcn,HashMap transportInfoMap,double totActVolume,double totActWeight,double totCaseVolume,double totCaseWeight,double totCaseCount,Connection conn )throws Exception
{ {
String errString = ""; String errString = "";
String sql = ""; String sql = "";
...@@ -11024,7 +11072,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11024,7 +11072,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
boolean isActivePickHdr = false; boolean isActivePickHdr = false;
String pickHdrCpy = ""; String pickHdrCpy = "";
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end //Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
String shipType = "";
try try
{ {
...@@ -11035,7 +11084,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11035,7 +11084,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
maxWeight = (String)transportInfoMap.get("MAX_WEIGHT"); maxWeight = (String)transportInfoMap.get("MAX_WEIGHT");
locTypeTransport = (String)transportInfoMap.get("LOC_TYPE"); locTypeTransport = (String)transportInfoMap.get("LOC_TYPE");
custCodeDlv = (String)transportInfoMap.get("CUST_CODE_DLV"); custCodeDlv = (String)transportInfoMap.get("CUST_CODE_DLV");
shipType = (String)transportInfoMap.get("SHIP_TYPE");
docLoc = getDocLoc(tranCode, conn); docLoc = getDocLoc(tranCode, conn);
if(docLoc == null || docLoc.length() == 0) if(docLoc == null || docLoc.length() == 0)
{ {
...@@ -11069,12 +11119,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11069,12 +11119,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y"; stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y";
pPickAllow = genericUtility.getColumnValue("parcelpack_allow",detailDom); pPickAllow = genericUtility.getColumnValue("parcelpack_allow",detailDom);
pPickAllow = (pPickAllow != null && pPickAllow.length() > 0)?pPickAllow:"Y"; pPickAllow = (pPickAllow != null && pPickAllow.length() > 0)?pPickAllow:"Y";
masterPackOverride = genericUtility.getColumnValue("master_override",headerDom); /*
masterPackOverride = genericUtility.getColumnValue("master_override",headerDom);
masterPackOverride = (masterPackOverride != null && masterPackOverride.length() > 0)?masterPackOverride:"N"; masterPackOverride = (masterPackOverride != null && masterPackOverride.length() > 0)?masterPackOverride:"N";
parcelPickOverride = genericUtility.getColumnValue("parcel_override",headerDom); parcelPickOverride = genericUtility.getColumnValue("parcel_override",headerDom);
parcelPickOverride = (parcelPickOverride != null && parcelPickOverride.length() > 0)?parcelPickOverride:"N"; parcelPickOverride = (parcelPickOverride != null && parcelPickOverride.length() > 0)?parcelPickOverride:"N";
*/
System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]"); System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]");
System.out.println("Master Pack Override["+masterPackOverride+"]Parcel Pick Override["+parcelPickOverride+"]"); System.out.println("ship Type["+shipType+"]");
if(totActWeight > 0 && totActVolume > 0) if(totActWeight > 0 && totActVolume > 0)
{ {
...@@ -11096,7 +11148,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11096,7 +11148,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//if(totCaseVolume > 0 && totCaseWeight > 0) //if(totCaseVolume > 0 && totCaseWeight > 0)
//if(totCaseVolume > 0 && totCaseWeight > 0 && totCaseWeight <= masterPackWeightPerOrder && "Y".equalsIgnoreCase(mPackAllow)) //if(totCaseVolume > 0 && totCaseWeight > 0 && totCaseWeight <= masterPackWeightPerOrder && "Y".equalsIgnoreCase(mPackAllow))
if(totCaseVolume > 0 && totCaseWeight > 0 && "Y".equalsIgnoreCase(mPackAllow) && (totCaseWeight <= masterPackWeightPerOrder || "Y".equalsIgnoreCase(masterPackOverride))) //if(totCaseVolume > 0 && totCaseWeight > 0 && "Y".equalsIgnoreCase(mPackAllow) && (totCaseWeight <= masterPackWeightPerOrder || "Y".equalsIgnoreCase(masterPackOverride)))
if(totCaseVolume > 0 && totCaseWeight > 0 && "Y".equalsIgnoreCase(mPackAllow) && (totCaseWeight <= masterPackWeightPerOrder || "M".equalsIgnoreCase(shipType)))
{ {
if(totCaseWeight < masterPackWeight) if(totCaseWeight < masterPackWeight)
...@@ -11213,7 +11266,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11213,7 +11266,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 31/12/12 for Parcel Pick //Changed By Pragyan 31/12/12 for Parcel Pick
//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) && "M".equalsIgnoreCase(shipType)) || ("Y".equalsIgnoreCase(pPickAllow) && "P".equalsIgnoreCase(shipType)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
{ {
System.out.println("--INSIDE MASTER PACK BLOCK--"); System.out.println("--INSIDE MASTER PACK BLOCK--");
cashCount = Math.floor(quantity /packSize) ; cashCount = Math.floor(quantity /packSize) ;
...@@ -17123,7 +17176,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17123,7 +17176,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("Return Suggested Location will throw error == >["+suggLocCode+"]"); System.out.println("Return Suggested Location will throw error == >["+suggLocCode+"]");
return suggestedLocList; return suggestedLocList;
} }
private HashMap getTransportInfo(String saleOrder,double perShipWeight ,double noArt,Connection conn) throws ITMException private HashMap getTransportInfo(String saleOrder,double perShipWeight ,double noArt,String shipType,Connection conn) throws ITMException
{ {
String sql = ""; String sql = "";
String sql1 = ""; String sql1 = "";
...@@ -17138,7 +17191,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17138,7 +17191,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String tranCode = "",transMod= "",maxWeight= "",locType= ""; String tranCode = "",transMod= "",maxWeight= "",locType= "";
String pinTo = "",pinFrm = ""; String pinTo = "",pinFrm = "";
HashMap stationInfoMap = null; HashMap stationInfoMap = null;
String dbShipType = "";
try try
{ {
HashMap sordMap = getSordInfo(saleOrder,conn); HashMap sordMap = getSordInfo(saleOrder,conn);
...@@ -17240,7 +17293,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17240,7 +17293,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//sql = "SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B " //sql = "SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B "
// +" WHERE A.PIN__FR = ? AND A.PIN__TO = ? AND A.STAN_CODE__FR = ? AND A.STAN_CODE__TO = ? " // +" WHERE A.PIN__FR = ? AND A.PIN__TO = ? AND A.STAN_CODE__FR = ? AND A.STAN_CODE__TO = ? "
//+" AND A.STATE_CODE__FR = ? AND A.STATE_CODE__TO = ? AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? "; //+" AND A.STATE_CODE__FR = ? AND A.STATE_CODE__TO = ? AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? ";
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B " //sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B "
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
//Change By Pragyan 02/01/12 to check max & min case //Change By Pragyan 02/01/12 to check max & min case
...@@ -17248,6 +17302,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17248,6 +17302,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ?"; // + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ?";
+ "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?"; + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
//Changed By Pragyan To add Ship type in distriute query.start
if(shipType != null && shipType.length() > 0 && !"A".equalsIgnoreCase(shipType))
{
sql = sql + " AND SHIP_TYPE = ? ";
}
//Changed By Pragyan To add Ship type in distriute query.end
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pinFrm); pstmt.setString(1,pinFrm);
pstmt.setString(2,pinTo); pstmt.setString(2,pinTo);
...@@ -17260,6 +17320,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17260,6 +17320,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setDouble(9,perShipWeight); pstmt.setDouble(9,perShipWeight);
pstmt.setDouble(10,noArt); pstmt.setDouble(10,noArt);
pstmt.setDouble(11,noArt); pstmt.setDouble(11,noArt);
//Changed By Pragyan To add Ship type in distriute query.start
if(shipType != null && shipType.length() > 0 && !"A".equalsIgnoreCase(shipType))
{
pstmt.setString(12,shipType);
}
//Changed By Pragyan To add Ship type in distriute query.end
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
...@@ -17269,6 +17336,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17269,6 +17336,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
transMod = rs.getString("TRANS_MODE"); transMod = rs.getString("TRANS_MODE");
maxWeight = rs.getString("MAX_WEIGHT"); maxWeight = rs.getString("MAX_WEIGHT");
locType = rs.getString("LOC_TYPE"); locType = rs.getString("LOC_TYPE");
dbShipType = checkNull(rs.getString("SHIP_TYPE"));
} }
else else
{ {
...@@ -17281,7 +17349,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17281,7 +17349,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// +" WHERE A.PIN__FR = ? AND A.PIN__TO = ? AND A.STAN_CODE__FR = ? AND A.STAN_CODE__TO = ? " // +" WHERE A.PIN__FR = ? AND A.PIN__TO = ? AND A.STAN_CODE__FR = ? AND A.STAN_CODE__TO = ? "
//+" AND A.STATE_CODE__FR = ? AND A.STATE_CODE__TO = ? AND A.DIST_ROUTE = B.DIST_ROUTE "; //+" AND A.STATE_CODE__FR = ? AND A.STATE_CODE__TO = ? AND A.DIST_ROUTE = B.DIST_ROUTE ";
//change by Kunal Mandhre on 07/08/12 as per S Manoharan Sir instruction //change by Kunal Mandhre on 07/08/12 as per S Manoharan Sir instruction
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B " //sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B "
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
//Change By Pragyan 02/01/12 to check max & min case //Change By Pragyan 02/01/12 to check max & min case
...@@ -17289,6 +17358,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17289,6 +17358,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? "; // + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? ";
+ "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?"; + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
if(shipType != null && shipType.length() > 0 && !"A".equalsIgnoreCase(shipType))
{
sql = sql + "AND SHIP_TYPE = ? ";
}
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pinFrm); pstmt.setString(1,pinFrm);
pstmt.setString(2,pinTo); pstmt.setString(2,pinTo);
...@@ -17300,6 +17374,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17300,6 +17374,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setDouble(8,perShipWeight); pstmt.setDouble(8,perShipWeight);
pstmt.setDouble(9,noArt); pstmt.setDouble(9,noArt);
pstmt.setDouble(10,noArt); pstmt.setDouble(10,noArt);
if(shipType != null && shipType.length() > 0 && !"A".equalsIgnoreCase(shipType))
{
pstmt.setString(11,shipType);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -17308,6 +17386,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17308,6 +17386,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
transMod = rs.getString("TRANS_MODE"); transMod = rs.getString("TRANS_MODE");
maxWeight = rs.getString("MAX_WEIGHT"); maxWeight = rs.getString("MAX_WEIGHT");
locType = rs.getString("LOC_TYPE"); locType = rs.getString("LOC_TYPE");
dbShipType = checkNull(rs.getString("SHIP_TYPE"));
} }
/* /*
else else
......
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