Skip to content

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

shipment ic validation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92578 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 29d085bb
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 30 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ ebb92832
......@@ -523,9 +523,7 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
if(cnt == 0)
{
errList.add( "VTPTCNCD1");
errFields.add( childNodeName.toLowerCase() );
return errString = getErrorString( "ptcn", "VTPTCNCD1", userId );
errFields.add( childNodeName.toLowerCase() );
}
}
rs.close();
......@@ -533,24 +531,6 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
pstmt.close();
pstmt = null;
//Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not start.
sql = "SELECT PTCN FROM SHIP_DOCS WHERE PTCN = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if( rs.next() )
{
errList.add( "VTPTCNALLX");
errFields.add( childNodeName.toLowerCase() );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not end
// added by cpatil
sql = "SELECT D.TRAN_CODE FROM WAVE_TASK_DET W, DESPATCH D WHERE REF_ID = D.DESP_ID AND D.CONFIRMED != 'Y' and W.PTCN= ? ";
pstmt = conn.prepareStatement(sql);
......@@ -577,7 +557,7 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
// end
//Changed by sumit on 23/01/13 validating repeat ptcn start
arrayList = checkDuplicaterecord(dom2);
arrayList = checkDuplicaterecord(dom2);
Set s = new HashSet(arrayList);
System.out.println("Size of arrayList ["+arrayList.size()+"]");
System.out.println("Size of Set ["+s.size()+"]");
......@@ -587,9 +567,7 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
errFields.add( childNodeName.toLowerCase() );
}
s.clear();
//Changed by sumit on 23/01/13 validating repeat ptcn end
//Changed by sumit on 23/01/13 validating repeat ptcn end
}
......@@ -1555,9 +1533,9 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
// added by cpatil on 8-sept-12 start
System.out.println("@@@@@ cpatil test");
//Changed by sumit on 25/01/13 changed sql.
//Changed by sumit on 25/01/13 removed confirmed from sql.
//sql = "SELECT D.TRAN_CODE FROM WAVE_TASK_DET W, DESPATCH D WHERE REF_ID = D.DESP_ID AND D.CONFIRMED != 'Y' and W.PTCN= ? ";
sql = "SELECT D.TRAN_CODE FROM WAVE_TASK_DET W, DESPATCH D WHERE REF_ID = D.DESP_ID and W.PTCN= ? ";
sql = "SELECT D.TRAN_CODE FROM WAVE_TASK_DET W, DESPATCH D WHERE REF_ID = D.DESP_ID and W.PTCN= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrs.java
View file @ ebb92832
......@@ -63,6 +63,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
ResultSet rs = null;
PreparedStatement pstmt = null;
String errString = "";
String tempPtcn = "";
int count = 0;
HashMap ptcnAndConsingnee = new HashMap();
HashMap newPtcnAndNewConsingnee = new HashMap();
......@@ -79,7 +82,7 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
int detLine = 0;
Node parentNode = null;
String updateFlag = "";
String shipmentId = "";
parentNodeList = dom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength();
for(int row = 0; row < parentNodeListLength; row++)
......@@ -89,11 +92,38 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
//System.out.println(" update flag ["+updateFlag+"]");
if(!"D".equalsIgnoreCase(updateFlag))
{
ptcn.add(GenericUtility.getInstance().getColumnValueFromNode("ptcn", dom.getElementsByTagName("Detail2").item(row)));
tempPtcn = GenericUtility.getInstance().getColumnValueFromNode("ptcn", dom.getElementsByTagName("Detail2").item(row));
ptcn.add(tempPtcn);
shipmentId = checkNull(GenericUtility.getInstance().getColumnValueFromNode("shipment_id", dom.getElementsByTagName("Detail2").item(row)));
if( shipmentId == null || shipmentId.length() == 0 )
{
sql = "SELECT PTCN FROM SHIP_DOCS WHERE PTCN = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tempPtcn);
}
else
{
sql = "SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID <> ? AND PTCN = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, shipmentId);
pstmt.setString(2, tempPtcn);
}
rs = pstmt.executeQuery();
if( rs.next())
{
errString = itmDBAccessEJB.getErrorString("","VTPTCNALLX","","",conn);
return errString;
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
System.out.println(" ptcn ["+ptcn+"]");
System.out.println(" ptcn ["+ptcn+"] shipmentId ["+shipmentId+"]");
if( !isConsingneeSameOfEnteredPTCN( ptcn, conn )) // is ship consignee are same for entered ptcn
{
System.out.println(" isConsingneeSameOfAllPTCN ");
......@@ -176,6 +206,11 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
{
try
{
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
......
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