Skip to content

B
business-java
Commit 7f0d7c1a 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@92615 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ca9356e1
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 9 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 7f0d7c1a
......@@ -3592,6 +3592,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String saleOrder = "";
String tranCode = "";
String transMode = "";
String dbShipType = "";
//Changed by Rohan on 1-12-11 on [WM1ESUN006] to generate automatic ptcn number
String ptcnID = "";
String itemCode = "";
......@@ -3954,6 +3955,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment,totCaseCount,shipType, conn);
tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
transMode = (String)transPorterInfoMap.get("TRANS_MODE");
dbShipType = (String)transPorterInfoMap.get("SHIP_TYPE");
if(tranCode == null || tranCode.length() <= 0)
{
......@@ -3961,6 +3963,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
return errString = itmDBAccessEJB.getErrorString("","NVLTRANCOD","","",conn);
}
if("Y".equalsIgnoreCase(mPackAllow) && "M".equalsIgnoreCase(shipType) && !"M".equalsIgnoreCase(dbShipType))
{
return errString = itmDBAccessEJB.getErrorString("","NVLTRANCOD","","",conn);
}
if("Y".equalsIgnoreCase(pPickAllow) && "P".equalsIgnoreCase(shipType) && !"P".equalsIgnoreCase(dbShipType))
{
return errString = itmDBAccessEJB.getErrorString("","NVLTRANCOD","","",conn);
}
//Changed By Pragyan 26/12/12/ To send the List with ordered Location
// 05/07/12 separate list for PSO and DSO as earlier logic is wrong
//if(replList.size() > 0 || pickList.size() > 0)
......@@ -17300,13 +17312,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Change By Pragyan 02/01/12 to check max & min case
// + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? ";
// + "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 = ? ";
}
else
{
sql = sql + " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
}
//Changed By Pragyan To add Ship type in distriute query.end
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pinFrm);
......@@ -17315,16 +17332,26 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setString(4,stanCodeCust);
pstmt.setString(5,stateCodeFrm);
pstmt.setString(6,stateCodeCust);
//Changed By Pragyan To add Ship type in distriute query.start
pstmt.setString(7,custCodeDlv);
/*
pstmt.setDouble(8,perShipWeight);
pstmt.setDouble(9,perShipWeight);
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);
pstmt.setString(8,shipType);
}
else
{
pstmt.setString(7,custCodeDlv);
pstmt.setDouble(8,perShipWeight);
pstmt.setDouble(9,perShipWeight);
pstmt.setDouble(10,noArt);
pstmt.setDouble(11,noArt);
}
//Changed By Pragyan To add Ship type in distriute query.end
rs = pstmt.executeQuery();
......@@ -17356,12 +17383,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Change By Pragyan 02/01/12 to check max & min case
// + "AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE ";
// + "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 = ? ";
sql = sql + " AND SHIP_TYPE = ? ";
}
else
{
sql = sql + " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
}
//Changed By Pragyan To add Ship type in distriute query.end
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pinFrm);
......@@ -17370,13 +17403,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setString(4,stanCodeCust);
pstmt.setString(5,stateCodeFrm);
pstmt.setString(6,stateCodeCust);
pstmt.setDouble(7,perShipWeight);
/*pstmt.setDouble(7,perShipWeight);
pstmt.setDouble(8,perShipWeight);
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);
pstmt.setString(7,shipType);
}
else
{
pstmt.setDouble(7,perShipWeight);
pstmt.setDouble(8,perShipWeight);
pstmt.setDouble(9,noArt);
pstmt.setDouble(10,noArt);
}
rs = pstmt.executeQuery();
if(rs.next())
......
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