bug fix in depacth ic

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104380 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/DispatchIC.java

@@ -234,6 +234,19 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 						//end
 
 					}
+					//changed by Nasruddin Start 09/01/17 start
+					if (childNodeName.equalsIgnoreCase("desp_id")) 
+					{
+						custCodeDlv = checkNull(genericUtility.getColumnValue("count_code__dlv", dom));
+						isExist = isExist("country", "count_code", custCodeDlv, conn);
+						if(!isExist)
+						{
+							errCode = "VTCONTCD1";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+					}
+					//changed by Nasruddin Start 09/01/17 End
 					if (childNodeName.equalsIgnoreCase("sord_no")) 
 					{
 						sordNo = checkNull(genericUtility.getColumnValue("sord_no", dom));
@@ -368,6 +381,15 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 								errFields.add(childNodeName.toLowerCase());
 							}
 						}
+						//changed by nasruddin 9-1-17 start
+						else
+						{
+							errCode = "VTTRANCODE";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+						//changed by nasruddin 9-1-17 end
+
 					}
 					if (childNodeName.equalsIgnoreCase("stan_code")) 
 					{
@@ -3823,7 +3845,6 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 				else if (currentColumn.trim().equalsIgnoreCase("shipment_id"))
 				{
 					shipmentId = checkNull(genericUtility.getColumnValue("shipment_id", dom));
-
 					sql = " select lorry_no, lr_no, lr_date, tran_code , "+
 							"	gross_weight,tare_weight, bill_no, bill_date "+
 							" from shipment "+
@@ -3841,12 +3862,6 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 						tareWeight = rs.getDouble("tare_weight");
 						billNo = checkNull(rs.getString("bill_no"));
 						billDate = rs.getTimestamp("bill_date");
-					}
-					rs.close();
-					rs = null;
-					pStmt.close();
-					pStmt = null;
-
 						nettWeight = grossWeight - tareWeight;
 
 						valueXmlString.append("<gross_wt__ship>").append("<![CDATA[" + grossWeight + "]]>").append("</gross_wt__ship>");
@@ -3883,6 +3898,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 						{
 							valueXmlString.append("<sb_no>").append("<![CDATA[" + billNo + "]]>").append("</sb_no>");
 						}
+
 						if( isnull(billDateDesp) )
 						{
 							if( billDate != null )
@@ -3908,20 +3924,41 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 							valueXmlString.append("<sh_name>").append("<![CDATA[" + tranName + "]]>").append("</sh_name>");
 						}
 					}
+					//changed by nasruddin start
+					else
+					{
+						valueXmlString.append("<gross_wt__ship>").append("<![CDATA[]]>").append("</gross_wt__ship>");
+						valueXmlString.append("<tare_wt__ship>").append("<![CDATA[]]>").append("</tare_wt__ship>");
+						valueXmlString.append("<nett_wt__ship>").append("<![CDATA[]]>").append("</nett_wt__ship>");
+						valueXmlString.append("<sh_name>").append("<![CDATA[]]>").append("</sh_name>");
+						valueXmlString.append("<tran_code>").append("<![CDATA[]]>").append("</tran_code>");
+						valueXmlString.append("<sb_date>").append("<![CDATA[]]>").append("</sb_date>");
+						valueXmlString.append("<sb_no>").append("<![CDATA[]]>").append("</sb_no>");
+						valueXmlString.append("<lr_date>").append("<![CDATA[]]>").append("</lr_date>");
+						valueXmlString.append("<lr_no>").append("<![CDATA[]]>").append("</lr_no>");
+					}
+					//changed by nasruddin end
+					rs.close();
+					rs = null;
+					pStmt.close();
+					pStmt = null;
+				} 
+				
 				else if (currentColumn.trim().equalsIgnoreCase("stan_code__dest"))
 				{
 					stanCodeDest = genericUtility.getColumnValue("stan_code__dest", dom);
 					stationDescrDest =  getValue("descr", "station", "stan_code", stanCodeDest, conn);
 					valueXmlString.append("<station_descr__dest>").append("<![CDATA[" + stationDescrDest + "]]>").append("</station_descr__dest>");
 				} 
-				else if (currentColumn.trim().equalsIgnoreCase("gross_weight") || currentColumn.trim().equalsIgnoreCase("nett_weight")) 
+		
+				else if (currentColumn.trim().equalsIgnoreCase("gross_weight") || currentColumn.trim().equalsIgnoreCase("tare_weight")) 
 				{ 
 					lc_gross_weight =  Double.parseDouble(checkDoubleNull(genericUtility.getColumnValue("gross_weight", dom)));
-					lc_nett_weight = Double.parseDouble(checkDoubleNull(genericUtility.getColumnValue("nett_weight", dom)));
+					lc_nett_weight = Double.parseDouble(checkDoubleNull(genericUtility.getColumnValue("tare_weight", dom)));
 					lc_tare_weight = lc_gross_weight - lc_nett_weight;
-					valueXmlString.append("<tare_weight>").append("<![CDATA["+lc_tare_weight+"]]>").append("</tare_weight>");
+					valueXmlString.append("<nett_weight>").append("<![CDATA["+lc_tare_weight+"]]>").append("</nett_weight>");
 				}
-
+				// changed by Nasruddin 12-01-17 End
 				// case 1 end
 				valueXmlString.append("</Detail1>");
 				break;