Changes in SalesReturnConf.java for DDUK

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

webitm-wms/ibase/webitm/ejb/wms/SalesReturnConf.java

@@ -1558,7 +1558,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		PreparedStatement pstmt = null,pstmt1 = null;
 		applDate = genericUtility.getApplDateFormat();
 		dbDate = genericUtility.getDBDateFormat();
-		String tranId = "",siteCode = "",xtraParams = "";
+		String tranId = "",siteCode = "",xtraParams = "", invoiceId = "";
 		String custCode = "",buyerName = "",notifyTo = "",itemSer = "",custPord = "",salesPers = "",taxEnv = "",priceList = "",
 		crTerm = "",remarks = "",dlvAdd1 = "",dlvAdd2 = "",dlvAdd3 = "",dlvCity = "",stateCodeDlv = "",counCodeDlv = "",
 		tranCode = "",dlvTerm = "",empCodeOrd = "",transMode = "",rcpMode = "",dlvTo = "",currCode = "",dlvPin = "",
@@ -1576,6 +1576,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		StringBuffer xmlBuffer = new StringBuffer();
 		tranId = sreturnDetailMap.get("TRAN_ID");
 		siteCode = sreturnDetailMap.get("SITE_CODE");
+		invoiceId = sreturnDetailMap.get("INVOICE_ID");
 		xtraParams = sreturnDetailMap.get("XTRA_PARAM");		
 
 		chgUser = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));		
@@ -1821,7 +1822,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 
 				double netTotAmtD = 0,ordValue=0;
 				int domId = 0;
-				sql = "select line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt,item_descr,"
+				/*sql = "select line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt,item_descr,"
 						+ "item_code__ord,item_ser,hold_flag,unit,item_code,chg_date,chg_user,chg_term,conv__qty_stduom,"
 						+ "unit__rate,pack_code,quantity__fc,unit__std,quantity__stduom,"
 						+ "conv__rtuom_stduom,status,status_date,no_art,rate__clg,rate__std,rate__stduom," //7
@@ -1829,9 +1830,23 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 						+ "ord_value,min_shelf_life,max_shelf_life,comm_perc_1,comm_perc_on_1,comm_perc_on_2," //6
 						+ "comm_perc_3,comm_perc_on_3 ,item_ser__prom,over_ship_perc,sales_pers_comm_1," //5
 						+ "sales_pers_comm_2,sales_pers_comm_3,loc_type,nature,net_tot_amt," //7
-						+ "billback_amt,offinv_amt,cust_spec__no,spec_ref  from sorddet where sale_order = ?";
+						+ "billback_amt,offinv_amt,cust_spec__no,spec_ref  from sorddet where sale_order = ?";*/
+
+				sql = "SELECT S.LINE_NO,S.SITE_CODE,S.ITEM_FLG,S.QUANTITY,S.DSP_DATE,S.RATE,S.DISCOUNT,S.TAX_AMT,S.TAX_ENV,S.NET_AMT,S.ITEM_DESCR, "
+					+ "S.ITEM_CODE__ORD,S.ITEM_SER,S.HOLD_FLAG,S.UNIT,S.ITEM_CODE,S.CHG_DATE,S.CHG_USER,S.CHG_TERM,S.CONV__QTY_STDUOM, "
+					+ "S.UNIT__RATE,S.PACK_CODE,S.QUANTITY__FC,S.UNIT__STD,S.QUANTITY__STDUOM, "
+					+ "S.CONV__RTUOM_STDUOM,S.STATUS,S.STATUS_DATE,S.NO_ART,S.RATE__CLG,S.RATE__STD,S.RATE__STDUOM, " 
+					+ "S.ORD_VALUE,S.MIN_SHELF_LIFE,S.MAX_SHELF_LIFE,S.COMM_PERC_1,S.COMM_PERC_ON_1,S.COMM_PERC_ON_2, "  
+					+ "S.COMM_PERC_3,S.COMM_PERC_ON_3 ,S.ITEM_SER__PROM,S.OVER_SHIP_PERC,S.SALES_PERS_COMM_1, "
+					+ "S.SALES_PERS_COMM_2,S.SALES_PERS_COMM_3,S.LOC_TYPE,S.NATURE,S.NET_TOT_AMT, "
+					+ "S.BILLBACK_AMT,S.OFFINV_AMT,S.CUST_SPEC__NO,S.SPEC_REF  " 
+					+ "FROM SORDDET S, INVOICE_TRACE I, SRETURNDET SR  "
+					+ "WHERE S.LINE_NO = I.SORD_LINE_NO AND SR.LINE_NO__INV = I.LINE_NO AND "
+					+ "S.SALE_ORDER = ? AND SR.TRAN_ID = ? AND I.INVOICE_ID = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, saleOrder);
+				pstmt.setString(2, tranId);
+				pstmt.setString(3, invoiceId);
 				rs = pstmt.executeQuery();
 				while(rs.next())
 				{