updated

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

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

@@ -1126,8 +1126,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 				xmlBuff.append("<count_code__dlv><![CDATA["+ countCode +"]]></count_code__dlv>");
 				xmlBuff.append("<tran_id__porcp><![CDATA["+ tranId +"]]></tran_id__porcp>");
 				xmlBuff.append("<status_remarks><![CDATA["+ " generate from receipt  "+tranId +"]]></status_remarks>");
-				xmlBuff.append("<CHG_USER><![CDATA["+ userId +"]]></CHG_USER>");
-				xmlBuff.append("<CHG_TERM><![CDATA["+ termId +"]]></CHG_TERM>");
+				xmlBuff.append("<chg_user><![CDATA["+ userId +"]]></chg_user>");
+				xmlBuff.append("<chg_term><![CDATA["+ termId +"]]></chg_term>");
 				xmlBuff.append("<chg_date><![CDATA["+ currDate +"]]></chg_date>");
 				xmlBuff.append("<purc_order><![CDATA["+ purcOrder +"]]></purc_order>");
 				xmlBuff.append("<tran_code><![CDATA["+ tranCode.trim() +"]]></tran_code>");
@@ -1535,6 +1535,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 		DecimalFormat df = new DecimalFormat("#########.###");
 		String sqlTemp ="";
 		String trackInfoXml="" ,ipAddress="",trackRequest="";
+		double netWeightFmPorcp = 0d,tareWeightFmPorcp=0d,grossWeightFmPorcp=0d;
 		try   
 		{
 				System.out.println("@@@@@@@ despatchOrder  function called");
@@ -1700,16 +1701,19 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					convRtuomStduom = rs.getString("conv__rtuom_stduom");	
 					netAmt = rs.getString("net_amt");	
 
-					sql ="select lot_sl,lot_no,loc_code  from porcpdet where tran_id = ? and line_no = ? ";
+					sql =" SELECT LOT_SL,LOT_NO,LOC_CODE,GROSS_WEIGHT,TARE_WEIGHT,NET_WEIGHT  FROM PORCPDET WHERE TRAN_ID = ? AND LINE_NO = ? ";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1,tranId);
 					pstmt1.setString(2,lnNoSord);
 					rs1 = pstmt1.executeQuery();
 					if (rs1.next())
 					{
-						lotSl = rs1.getString("lot_sl")==null ? " ":rs1.getString("lot_sl");
-						lotNo = rs1.getString("lot_no")==null ? " ":rs1.getString("lot_no");
-						locCode = rs1.getString("loc_code")==null ? " ":rs1.getString("loc_code");
+						lotSl = rs1.getString("LOT_SL")==null ? " ":rs1.getString("LOT_SL");
+						lotNo = rs1.getString("LOT_NO")==null ? " ":rs1.getString("LOT_NO");
+						locCode = rs1.getString("LOC_CODE")==null ? " ":rs1.getString("LOC_CODE");
+						grossWeightFmPorcp		= rs1.getDouble("GROSS_WEIGHT");
+						tareWeightFmPorcp		= rs1.getDouble("TARE_WEIGHT");
+						netWeightFmPorcp		= rs1.getDouble("NET_WEIGHT");
 	
 					} 
 					rs1.close();
@@ -1833,9 +1837,9 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					xmlBuff.append("<quantity__inv><![CDATA["+ quantity +"]]></quantity__inv>");
 					xmlBuff.append("<quantity__real><![CDATA["+ quantity +"]]></quantity__real>");
 					// ADDED BY RITESH ON 26/05/13 START
-					xmlBuff.append("<gross_weight>").append("<![CDATA[").append(grossWeight1).append("]]>").append("</gross_weight>");
-					xmlBuff.append("<nett_weight>").append("<![CDATA[").append(netWeight1).append("]]>").append("</nett_weight>");
-					xmlBuff.append("<tare_weight>").append("<![CDATA[").append(tareWeight1).append("]]>").append("</tare_weight>");
+					xmlBuff.append("<gross_weight>").append("<![CDATA[").append(grossWeightFmPorcp).append("]]>").append("</gross_weight>");
+					xmlBuff.append("<nett_weight>").append("<![CDATA[").append(netWeightFmPorcp).append("]]>").append("</nett_weight>");
+					xmlBuff.append("<tare_weight>").append("<![CDATA[").append(tareWeightFmPorcp).append("]]>").append("</tare_weight>");
 					xmlBuff.append("<dimension><![CDATA["+ dimension +"]]></dimension>");
 					xmlBuff.append("<pallet_wt><![CDATA["+ palletWt +"]]></pallet_wt>");
 					xmlBuff.append("<pack_code><![CDATA["+ packCode +"]]></pack_code>");