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

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

@@ -555,23 +555,7 @@ public class PostOrderActivity {
 			pstmt.close();
 			pstmt=null;
 			
-			//Added By PriyankaC on 09MAY2019 to get qc_reqd from itemser .
-			sql="select case when qc_reqd is null then 'N' else qc_reqd end from itemser where item_ser = ?";
-			pstmt=conn.prepareStatement(sql);
-			pstmt.setString(1,itemSer);
-			rs=pstmt.executeQuery();
-			if(rs.next())
-			{
-				qcReqd=checkNull(rs.getString(1));
-			}
-			rs.close();
-			rs=null;
-			pstmt.close();
-			pstmt=null;
-			
-			if(qcReqd == null ||qcReqd.trim().length()==0)
-			{
-			//Added By PriyankaC on 09MAY2019. [END]
+			//Added By PriyankaC on 09MAY2019 to get qc_reqd from itemser.. .
 			sql="select case when qc_reqd is null then 'N' else qc_reqd end from site_supplier where site_code=? and supp_code= ? ";
 			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1,siteCodeCh);
@@ -585,7 +569,7 @@ public class PostOrderActivity {
 			rs=null;
 			pstmt.close();
 			pstmt=null;
-		}
+			
 			if(qcReqd == null ||qcReqd.trim().length()==0)
 			{
 				sql="select case when qc_reqd is null then 'N' else qc_reqd end from supplier where supp_code= ?";
@@ -600,6 +584,24 @@ public class PostOrderActivity {
 				rs=null;
 				pstmt.close();
 				pstmt=null;
+				
+			
+		}
+			if(qcReqd == null ||qcReqd.trim().length()==0)
+			{
+				sql="select case when qc_reqd is null then 'N' else qc_reqd end from itemser where item_ser = ?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1,itemSer);
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					qcReqd=checkNull(rs.getString(1));
+				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
+			//Added By PriyankaC on 09MAY2019. [END]
 			}
 			calcExchRate=fcommon.getDailyExchRateSellBuy(poCurrCode, currCodeBase, siteCodeCh, sdf.format(despDate), "B", conn);
 			xmlBuff = new StringBuffer();
@@ -770,8 +772,8 @@ public class PostOrderActivity {
 				//Commented by sarita on 26 DEC 2018 [END]
 
 				//Added By PriyankaC  to get qc_reqd from siteItem. [Start]
-				sql="select case when qc_reqd is null then 'N' else qc_reqd end,"
-						+ " siteitem where item_code = ? and  site_code = ?";
+				sql="select case when qc_reqd is null then 'N' else qc_reqd end"
+						+ " from siteitem where item_code = ? and  site_code = ?";
 				pstmt1=conn.prepareStatement(sql);
 				pstmt1.setString(1,itemCode);
 				pstmt1.setString(2,siteCodeCh);
@@ -786,8 +788,8 @@ public class PostOrderActivity {
 				pstmt1=null;
 				if(itemQcReqd == null || itemQcReqd.length() > 0)
 				{
-					sql="select case when qc_reqd is null then 'N' else qc_reqd end,"
-							+ " item where item_code = ? ";
+					sql=      "select case when qc_reqd is null then 'N' else qc_reqd end"
+							+ " from item where item_code = ? ";
 					pstmt1=conn.prepareStatement(sql);
 					pstmt1.setString(1,itemCode);
 					rs1=pstmt1.executeQuery();