Dist receipt posting qc_reqd to be taken from siteitem

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

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

@@ -335,8 +335,12 @@ public class DistOrderRcpConf extends ActionHandlerEJB implements DistOrderRcpCo
 			if(confPasswd!=null && confPasswd.trim().length()>0 && "N".equalsIgnoreCase(verifyPassword))
 			{
 				/**UnComment By Onkar Rane On 20/03/2018 for Password Validation**/
-				errString = itmDBAccessEJB.getErrorString("","VTPASS1","BASE","",conn);
-				return errString;
+				
+				
+				 errString = itmDBAccessEJB.getErrorString("","VTPASS1","BASE","",conn);
+			    	return errString;
+				
+				
 				/**Closed...**/
 //				lsPwdVerified = distCommon.getDisparams("999999","passwordVerified",conn);
 				//lsPwdVerified = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "passwordVerified");
@@ -2982,6 +2986,20 @@ public class DistOrderRcpConf extends ActionHandlerEJB implements DistOrderRcpCo
 					batchNo = lotNo;
 				}
 				
+				//changed by chaitali on 30-05-2019 [Start]
+				sql= "select qc_reqd from siteitem where site_code=? and item_code =?";
+				pstmt1=conn.prepareStatement(sql);
+				pstmt1.setString(1, SiteCode);
+				pstmt1.setString(2,itemCode);
+				rs1=pstmt1.executeQuery();
+				if(rs1.next())
+				{
+				qcReqd = rs1.getString("qc_reqd");
+				}
+				closeResources(pstmt1, rs1);
+
+				if(qcReqd==null || qcReqd.trim().length()==0)
+				{
 				sql = "select qc_reqd from distorder_type where tran_type in " +
 					"(select tran_type from distorder where dist_order in(select dist_order from distord_rcp where tran_id = ?))"; //TODO
 				pstmt1 = conn.prepareStatement(sql);
@@ -2993,9 +3011,11 @@ public class DistOrderRcpConf extends ActionHandlerEJB implements DistOrderRcpCo
 				qcReqd = qcReqd == null ? "N" : qcReqd.trim();
 				
 				System.out.println("qcReqd ........"+qcReqd);
-				
+				}
 				closeResources(pstmt1, rs1);
 				
+				//changed by chaitali on 30-05-2019 [End]
+				
 				if("Y".equalsIgnoreCase(qcReqd))
 				{
 					lineNo = "   "+lineNo.trim() ;
@@ -3294,7 +3314,7 @@ public class DistOrderRcpConf extends ActionHandlerEJB implements DistOrderRcpCo
 			pstmt.close();
 			pstmt = null;
 
-	}
+			}
 	catch(Exception e)
 	{
 		errString = "Error";