Purchase return : On full return click the lines are added but the receipt...

Purchase return : On full return click the lines are added but the receipt line number is not appearing and if a user is trying to edit and save then the system gives below error.

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

webitm-dis/ibase/webitm/ejb/dis/adv/PReturnAct.java

@@ -95,8 +95,8 @@ public class PReturnAct extends ActionHandlerEJB implements PReturnActLocal, PRe
 					return errString;
 				
 			}
-				
-			sql="select line_no,purc_order,line_no__ord,item_code,quantity,unit,rate,"+   
+			// Commented by Mahesh Saggam on 13 June 2019
+			/*sql="select line_no,purc_order,line_no__ord,item_code,quantity,unit,rate,"+   
 				"discount,tax_amt,net_amt,loc_code,lot_no,lot_sl,canc_bo,tax_class,"+   
 				"tax_chap,tax_env,acct_code__dr,cctr_code__dr,acct_code__cr,cctr_code__cr,"+   
 				"unit__rate,conv__qty_stduom,conv__rtuom_stduom,unit__std,quantity__stduom,"+   
@@ -108,7 +108,25 @@ public class PReturnAct extends ActionHandlerEJB implements PReturnActLocal, PRe
 				"dept_code,effect_stock,physical_status,benefit_type,licence_no,"+   
 				"acct_code__prov_dr,cctr_code__prov_dr,acct_code__prov_cr,cctr_code__prov_cr,"+   
 				"form_no,retest_date,duty_paid,batch_size,sample_qty,damage_qty from porcpdet "+ 
-				" where tran_id=?";
+				" where tran_id=?";*/
+			
+			// Added by Mahesh Saggam on 13 June 2019 [Start]
+			sql = "SELECT porcpdet.line_no as line_no, porcpdet.purc_order, porcpdet.line_no__ord,porcpdet.item_code,porcpdet.quantity,porcpdet.unit,porcpdet.rate,"+
+			"porcpdet.discount,porcpdet.tax_amt,porcpdet.net_amt,porcpdet.loc_code,porcpdet.lot_no,porcpdet.lot_sl,porcpdet.canc_bo,porcpdet.tax_class,porcpdet.tax_chap,"+
+			"porcpdet.tax_env,porcpdet.acct_code__dr,porcpdet.cctr_code__dr,porcpdet.acct_code__cr,porcpdet.cctr_code__cr,porcpdet.unit__rate,porcpdet.conv__qty_stduom,"+
+			"porcpdet.conv__rtuom_stduom,porcpdet.unit__std,porcpdet.quantity__stduom,porcpdet.rate__stduom,porcpdet.pack_code,porcpdet.no_art,porcpdet.pack_instr,porcpdet.batch_no,"+
+			"porcpdet.mfg_date,porcpdet.expiry_date,porcpdet.status,porcpdet.vouch_qty,porcpdet.gross_weight,porcpdet.tare_weight,porcpdet.net_weight,porcpdet.potency_perc,"+
+			"porcpdet.supp_code__mnfr,porcpdet.site_code__mfg,porcpdet.reas_code,porcpdet.remarks,porcpdet.challan_qty,porcpdet.grade,porcpdet.specific_instr,porcpdet.special_instr,"+
+			"porcpdet.loc_code__excess_short,porcpdet.excess_short_qty,porcpdet.additional_cost,porcpdet.rate__clg,porcpdet.supp_challan_qty,porcpdet.realised_qty,"+
+			"porcpdet.item_code__mfg,porcpdet.spec_ref,porcpdet.std_rate,porcpdet.dept_code,porcpdet.effect_stock,porcpdet.physical_status,porcpdet.benefit_type,porcpdet.licence_no,"+
+			"porcpdet.acct_code__prov_dr,porcpdet.cctr_code__prov_dr,porcpdet.acct_code__prov_cr,porcpdet.cctr_code__prov_cr,porcpdet.form_no,porcpdet.retest_date,porcpdet.duty_paid,"+
+			"porcpdet.batch_size,porcpdet.sample_qty,porcpdet.damage_qty ,A.descr"+
+			" FROM porcpdet ,item A"+
+			" WHERE porcpdet.item_code = A.item_code"+
+			" AND tran_id = ?";
+			// Added by Mahesh Saggam on 13 June 2019  [End]
+			
+			
 			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1, refTranId);
 			rs=pstmt.executeQuery();
@@ -119,10 +137,11 @@ public class PReturnAct extends ActionHandlerEJB implements PReturnActLocal, PRe
 				valueXmlString.append("<line_no isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("line_no"))+ "]]>").append("</line_no>");
 				valueXmlString.append("<purc_order isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("purc_order"))+ "]]>").append("</purc_order>");
 				valueXmlString.append("<line_no__ord isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("line_no__ord"))+ "]]>").append("</line_no__ord>");
-				//Added by Mahesh Saggam on 03-June-2019 [Start]
+				//Added by Mahesh Saggam on 13-June-2019 [Start]
 				valueXmlString.append("<line_no__rcp isSrvCallOnChg='0'>").append("<![CDATA[" + rs.getString("line_no") + "]]>").append("</line_no__rcp>");
 				valueXmlString.append("<tran_id__rcp isSrvCallOnChg='0'>").append("<![CDATA[" + refTranId + "]]>").append("</tran_id__rcp>");
-				//Added by Mahesh Saggam on 03-June-2019 [End]
+				valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append("<![CDATA[" + rs.getString("descr") + "]]>").append("</item_descr>");
+				//Added by Mahesh Saggam on 13-June-2019 [End]
 				valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("item_code"))+ "]]>").append("</item_code>");
 				valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[" +rs.getDouble("quantity")+ "]]>").append("</quantity>");
 				valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("unit"))+ "]]>").append("</unit>");