Changes in SQL add line_no__ord in porcpdet sql

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

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

@@ -3695,6 +3695,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 				String  mRtConvStr = "", mrate1 = "";
 				String ls_tranID = "", ls_tranIdRef = "";
 				String mQtyConvStr = "";
+				String	mPordLine1="";
 				double mOrdQty = 0, mDlvQty = 0;
 				String temp="            ";
 				SimpleDateFormat sdfNew = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -5110,7 +5111,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 
 				}else if(currentColumn.trim().equalsIgnoreCase("line_no__rcp"))
 				{
-
+                    System.out.println("inside-line_no__rcp");
 					ls_tranid_ref = checkNull(genericUtility.getColumnValue(
 							"tran_id__ref", dom1));
 					System.out.println("ls_tranid_ref@@"+ls_tranid_ref);
@@ -5170,6 +5171,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 								+ " rate__clg,dept_code, "
 								+ // prince -- dept_code -- 17-04-06
 								" acct_code__prov_dr, acct_code__prov_cr, cctr_code__prov_dr, cctr_code__prov_cr "
+								
 								+ " from porcpdet "
 								+ " where ( tran_id = ? ) and "
 								+ " ( purc_order = ? ) and "
@@ -5220,6 +5222,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 							ls_acct_pcr = checkNull(rs.getString(37));
 							ls_cctr_pdr = checkNull(rs.getString(38));
 							ls_cctr_pcr = checkNull(rs.getString(39));
+							
 
 						}
 						rs.close();
@@ -5254,7 +5257,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 					} else if ((ls_tranid_ref.trim().length() > 0)
 							&& (ls_lineno__rcp.trim().length() > 0)) {
 						
-						System.out.println("comming into if-else");
+						System.out.println("comming into if-else2");
 						
 						sql = " select item_code,            quantity,            unit,                rate, "
 								+ " discount ,            loc_code,            lot_no,            lot_sl, "
@@ -5266,7 +5269,9 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 								+ " supp_code__mnfr, site_code__mfg,    tax_amt,                    grade, std_rate, "
 								+ " rate__clg,dept_code, "
 								+ " acct_code__prov_dr, acct_code__prov_cr, cctr_code__prov_dr, cctr_code__prov_cr, "
-								+ " tax_class,tax_chap,tax_env  "
+								+ " tax_class,tax_chap,tax_env,  "
+								+"LINE_NO__ORD  "//Add by Ajay on 08/05/18
+								
 								+ // move below tax details in same sql which
 									// coming from porcpdet instead of porddet
 									// -D14ISUN003
@@ -5324,6 +5329,8 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 							mtaxclass = chkNull(rs.getString(40));
 							mtaxchap = chkNull(rs.getString(41));
 							mtaxenv = chkNull(rs.getString(42));
+							mPordLine = chkNull(rs.getString(43));//Add by Ajay on 08/05/18
+							
 
 						}
 						rs.close();
@@ -5339,14 +5346,14 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 
 					} else 
 					{
-						System.out.println("comming into else@1");
+						System.out.println("comming into else@3");
 						sql = "Select Item_code,quantity, unit,rate, "//4
 								+ " discount,tax_amt, tot_amt,         loc_code, "//4
 								+ " tax_class,             tax_chap,             tax_env,         conv__qty_stduom, " //4
 								+ " conv__rtuom_stduom,    unit__rate ,        acct_code__dr, cctr_code__dr, "//4
 								+ " acct_code__cr,        cctr_code__cr,        unit__std,        unit__rate, "//4
 								+ " rate__stduom,            quantity__stduom, rate__clg,        dept_code, "//4
-								+
+								+ 
 								" acct_code__prov_dr, acct_code__prov_cr, cctr_code__prov_dr, cctr_code__prov_cr "//4
 								+ " from PordDet "
 								+ " Where Purc_order = ? and Line_no    = ? ";//CONV__RTUOM_STDUOM
@@ -5385,6 +5392,8 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 							ls_acct_pcr = checkNull(rs.getString(26));
 							ls_cctr_pdr = checkNull(rs.getString(27));
 							ls_cctr_pcr = checkNull(rs.getString(28));
+							
+				
 
 						}
 						rs.close();
@@ -5393,6 +5402,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 						pstmt = null;
 						System.out.println("sql@@@"+sql);
 					}
+					
 						if(mrate <= 0) {
 
 							sql = "select price_list  "
@@ -5437,6 +5447,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 						System.out.println(mtaxclass+"--"+mtaxchap+"--"+mtaxenv);
 						valueXmlString.append("<line_no__ord>")
 								.append("<![CDATA[" + mPordLine + "]]>")
+						
 								.append("</line_no__ord>");
 						valueXmlString.append("<item_code>")
 								.append("<![CDATA[" + mItem + "]]>")
@@ -5715,7 +5726,8 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 					System.out.println("lot_no@@@@"+mlotno);
 					System.out.println("lot_sl@@@@"+mlotsl);
 					System.out.println("ls_tranid_ref@@"+ls_tranid_ref);
-
+					
+					
 				}
 				else if (currentColumn.trim().equalsIgnoreCase("item_code")) {
 					
@@ -6968,7 +6980,8 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 				valueXmlString.append("</Detail2>");
 			}
 			valueXmlString.append("</Root>");
-		} catch (Exception e) {
+		
+		}catch (Exception e) {
 			e.printStackTrace();
 			System.out.println("Exception ::" + e.getMessage());
 			throw new ITMException(e);