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

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

@@ -1824,6 +1824,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 
 					if (childNodeName.equalsIgnoreCase("rate")) 
 					{
+						System.out.println("InsideRate :" +rate );
+						lineNo = checkNull(genericUtility.getColumnValue("line_no", dom));
 						rateStr = checkNull(genericUtility.getColumnValue("rate", dom));
 						rateOStr = checkNull(genericUtility.getColumnValue("rate__o", dom));
 						itemCode = checkNull(genericUtility.getColumnValue("item_code", dom));
@@ -1861,28 +1863,31 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 						if(count >= 1)
 						{
 							
-							sql = " select rate from poamd_det  where"+
-                             "(  PURC_ORDER = ? )";
+							sql = " select rate from PORCPDET  WHERE "+
+                             " PURC_ORDER = ?  and LINE_NO__ORD = ?";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, purcOrder);
+							pstmt.setString(2, lineNoOrd);
 							rs = pstmt.executeQuery();
 							if(rs.next())
 							{
 								purcRate =   rs.getDouble(1); 
 							}
-							System.out.println("Result of purcRate Rate : " + purcRate +"current Rate : " +rateStr);
-							rs.close();
-							rs = null;
-							pstmt.close();
-							pstmt = null;
 							
-							if(!(rate == purcRate))
+							System.out.println("Result of purcRate Rate : " + purcRate +"current Rate : " +rateStr);
+							if(rate != purcRate)
 							{
 								System.out.println("Result of purcRate Rate1 : " + purcRate +"current Rate 1: " +rateStr +" VTCHINRATE");
 								errCode = "VTCHINRATE";//Changed In rate not applicable when PORCP is unconfirmed
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+							
+							
 						}
 						//Added By PriyankaC on 10JAN18.[END]
 						

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

@@ -141,7 +141,7 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 		String	ls_channelpartner="",ls_stkopt="",ls_tranid="",group_ship="",group_supp="",ls_value="",ls_sitecode="";
 		String	sFieldNo = "0", ls_purc_order="",ls_supp_code="",ls_form_no="",ls_eou="",ls_status="",ls_lot_no_old="";
 		String	ls_lot_sl_old="", ls_loc_code_old="", ls_line_no="" ,ls_stock_lotno="",ls_item_ser="" ,ls_site_supplier="" ,ls_site="",ls_invno="",ls_supp="",ls_msg_type="",ls_win="";
-		
+		boolean purcStatus = false; //Added By PriyankaC on 06JUNE2018..
 		//datetime mdate1, mdate2, ldt_date
 		Timestamp mdate1 = null, mdate2 = null, ldt_date = null,TranDate=null;
 		String poGno="",supp_code="";
@@ -1059,9 +1059,44 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 						System.out.println("Validation Quantity");
 						lineNoOrd =genericUtility.getColumnValue("line_no__ord",dom);
 						purcorder =genericUtility.getColumnValue("purc_order",dom);
+						siteCode = checkNull(genericUtility.getColumnValue("site_code", dom1));
 						lineNoOrd = "    " + lineNoOrd;
 						lineNoOrd = lineNoOrd.substring(lineNoOrd.length() - 3,lineNoOrd.length());
 						System.out.println("lineNoOrd@@["+lineNoOrd+"]");
+						//PriyankaC  [START]
+						sql = "select site_code from porddet where purc_order = ?and  line_no = ? ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, purcOrder);
+						pstmt.setString(2, lineNoOrd);
+						rs = pstmt.executeQuery();
+						if (rs.next()) 
+						{
+							//Change By PriyankaC on 30JAN2018..[START]
+							//site = rs.getString("site_code");
+							site = checkNull(rs.getString("site_code"));
+							System.out.println("site@@ " +site);
+							//Change By PriyankaC on 30JAN2018..[END]
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						if(site == null || site.trim().length() == 0)
+						{
+							System.out.println("VTORDDT1@@ ");
+							errCode = "VTORDDT1";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+						//if (!(siteCode).trim().equalsIgnoreCase(site)) //Change By PriyankaC on 30JAN2018..
+						if (!checkNull(siteCode).equalsIgnoreCase(site)) 
+						{
+							System.out.println("VTPORD6@@ ");
+							errCode = "VTPORD6";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+						//PriyankaC [END]
 						tranIdRef = checkNull(genericUtility.getColumnValue("tran_id__ref", dom1));
 						System.out.println("tranIdRef@@["+tranIdRef+"]");
 						if(tranIdRef.trim().length()>0 && tranIdRef!=null)//len(trim(mval2)) > 0
@@ -1080,7 +1115,6 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 							if (rs.next())
 							{
 								cnt = rs.getInt(1);
-								
 							}
 							rs.close();
 							rs = null;
@@ -1094,7 +1128,6 @@ public class PoReturnIC extends ValidatorEJB implements PoReturnICLocal,
 								 errList.add(errCode);
 								 errFields.add(childNodeName.toLowerCase());
 							 }
-							
 						}
 					}// end line_no__ord
 					else if (childNodeName.equalsIgnoreCase("unit"))