Skip to content

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

Issuetracker No 185:The validation in the shipment for ship consignee grp is... 

Issuetracker No 185:The validation in the shipment for ship consignee grp is checking cust code from despatch which is wrong , it should check the cust code dlv of despatch


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92991 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 292db340
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 10 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrs.java
View file @ f272153e
...@@ -411,9 +411,11 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -411,9 +411,11 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
inputString = buffer.toString(); inputString = buffer.toString();
inputString = inputString.substring(0, inputString.length() - 3 ); inputString = inputString.substring(0, inputString.length() - 3 );
System.out.println(" input string "+inputString); System.out.println(" input string "+inputString);
////Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
sql = "SELECT DISTINCT SHIP_CONS_GRP FROM CUSTOMER WHERE CUST_CODE IN " + //sql = "SELECT DISTINCT SHIP_CONS_GRP FROM CUSTOMER WHERE CUST_CODE IN " +
" ( SELECT CUST_CODE FROM DESPATCH D,WAVE_TASK_DET WTD WHERE WTD.WAVE_ID = D.WAVE_ID" + sql = "SELECT DISTINCT CASE WHEN SHIP_CONS_GRP IS NULL THEN CUST_CODE ELSE SHIP_CONS_GRP END AS SHIP_CONS_GRP FROM CUSTOMER WHERE CUST_CODE IN " +
//" ( SELECT CUST_CODE FROM DESPATCH D,WAVE_TASK_DET WTD WHERE WTD.WAVE_ID = D.WAVE_ID" +
" ( SELECT CUST_CODE__DLV FROM DESPATCH D,WAVE_TASK_DET WTD WHERE WTD.WAVE_ID = D.WAVE_ID" +
" AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN IN ('"+inputString+"') AND WTD.SALE_ORDER = D.SORD_NO )"; " AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN IN ('"+inputString+"') AND WTD.SALE_ORDER = D.SORD_NO )";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//pstmt.setString(1, inputString); //pstmt.setString(1, inputString);
...@@ -474,6 +476,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -474,6 +476,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
String inputString = ""; String inputString = "";
HashMap sipConsignee = new HashMap(); HashMap sipConsignee = new HashMap();
String stPTCN = ""; String stPTCN = "";
//Changed By Pragyan to store consignee group and customer code delivery.start
String shiptConsiGroup = "";
String shipCustCodeDlv = "";
try try
{ {
...@@ -492,13 +497,18 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -492,13 +497,18 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
/*sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE " + /*sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE " +
" AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN NOT IN '"+inputString+"' " + " AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN NOT IN '"+inputString+"' " +
" AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN '"+inputString+"' )";*/ " AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN '"+inputString+"' )";*/
sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE " + //Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
//sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE " +
sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
" AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN NOT IN ('"+inputString+"') " + " AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN NOT IN ('"+inputString+"') " +
" AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )"; " AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
sql1 = " SELECT C.SHIP_CONS_GRP FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " + //Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
" AND D.WAVE_ID = WTD.WAVE_ID AND C.CUST_CODE = D.CUST_CODE AND WTD.REF_ID = D.DESP_ID "; sql1 = //" SELECT C.SHIP_CONS_GRP FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
//" AND D.WAVE_ID = WTD.WAVE_ID AND C.CUST_CODE = D.CUST_CODE AND WTD.REF_ID = D.DESP_ID ";
"SELECT C.SHIP_CONS_GRP,D.CUST_CODE__DLV FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
" AND D.WAVE_ID = WTD.WAVE_ID AND C.CUST_CODE = D.CUST_CODE__DLV AND WTD.REF_ID = D.DESP_ID ";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
/*pstmt.setString(1, inputString); /*pstmt.setString(1, inputString);
...@@ -512,8 +522,21 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -512,8 +522,21 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if( rs1.next()) if( rs1.next())
{ {
// PTCN, "SHIP_CONS_GRP"; //Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
sipConsignee.put(stPTCN, rs1.getString("SHIP_CONS_GRP")); shiptConsiGroup = checkNull(rs1.getString("SHIP_CONS_GRP"));
shipCustCodeDlv = checkNull(rs1.getString("CUST_CODE__DLV"));
if(shiptConsiGroup.trim().length() > 0)
{
sipConsignee.put(stPTCN, shiptConsiGroup);
}
else
{
sipConsignee.put(stPTCN, shipCustCodeDlv);
}
//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.end
//PTCN, "SHIP_CONS_GRP";
//sipConsignee.put(stPTCN, rs1.getString("SHIP_CONS_GRP"));
} }
pstmt1.clearParameters(); pstmt1.clearParameters();
rs1.close(); rs1 = null; rs1.close(); rs1 = null;
...@@ -573,9 +596,13 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -573,9 +596,13 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
try try
{ {
//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
/*sql1 = " SELECT C.SHIP_CONS_GRP FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
" AND D.WAVE_ID = WTD.WAVE_ID AND C.CUST_CODE = D.CUST_CODE AND WTD.REF_ID = D.DESP_ID ";*/
sql1 = " SELECT CASE WHEN C.SHIP_CONS_GRP IS NULL THEN C.CUST_CODE ELSE C.SHIP_CONS_GRP END AS SHIP_CONS_GRP " +
" FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
" AND D.WAVE_ID = WTD.WAVE_ID AND C.CUST_CODE = D.CUST_CODE__DLV AND WTD.REF_ID = D.DESP_ID ";
sql1 = " SELECT C.SHIP_CONS_GRP FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
" AND D.WAVE_ID = WTD.WAVE_ID AND C.CUST_CODE = D.CUST_CODE AND WTD.REF_ID = D.DESP_ID ";
pstmt = conn.prepareStatement(sql1); pstmt = conn.prepareStatement(sql1);
Iterator iterator = ptcn.iterator(); Iterator iterator = ptcn.iterator();
......
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