Commit 3b8c7ba8 authored by ssarkar's avatar ssarkar

update by sumit on 11/02/13 bug solved


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92673 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6c1750f3
...@@ -64,7 +64,7 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -64,7 +64,7 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
String errString = ""; String errString = "";
String tempPtcn = ""; String tempPtcn = "";
Set refSer = new HashSet();//added by sumit on 11/02/13
int count = 0; int count = 0;
HashMap ptcnAndConsingnee = new HashMap(); HashMap ptcnAndConsingnee = new HashMap();
...@@ -95,6 +95,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -95,6 +95,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
tempPtcn = GenericUtility.getInstance().getColumnValueFromNode("ptcn", dom.getElementsByTagName("Detail2").item(row)); tempPtcn = GenericUtility.getInstance().getColumnValueFromNode("ptcn", dom.getElementsByTagName("Detail2").item(row));
ptcn.add(tempPtcn); ptcn.add(tempPtcn);
shipmentId = checkNull(GenericUtility.getInstance().getColumnValueFromNode("shipment_id", dom.getElementsByTagName("Detail2").item(row))); shipmentId = checkNull(GenericUtility.getInstance().getColumnValueFromNode("shipment_id", dom.getElementsByTagName("Detail2").item(row)));
//Changed by sumit on 11/02/13 getting ref ser
refSer.add(checkNull(GenericUtility.getInstance().getColumnValueFromNode("ref_ser", dom.getElementsByTagName("Detail2").item(row))).trim());
if( shipmentId == null || shipmentId.length() == 0 ) if( shipmentId == null || shipmentId.length() == 0 )
{ {
...@@ -122,9 +124,11 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -122,9 +124,11 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
} }
} }
System.out.println(" ptcn ["+ptcn+"] shipmentId ["+shipmentId+"]"); System.out.println(" ptcn ["+ptcn+"] shipmentId ["+shipmentId+"] refser.size() ["+refSer.size()+"] refSer "+refSer);
if( ptcn != null && ptcn.size() > 0 ) //Changed by sumit on 11/02/13 adding ref_ser condition
//if( ptcn != null && ptcn.size() > 0 )
if( ptcn != null && ptcn.size() > 0 && refSer.contains("S-DSP") && refSer.size() == 1)
{ {
if( !isConsingneeSameOfEnteredPTCN( ptcn, conn )) // is ship consignee are same for entered ptcn if( !isConsingneeSameOfEnteredPTCN( ptcn, conn )) // is ship consignee are same for entered ptcn
......
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