UPDATED

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

webitm-mfg/ibase/webitm/ejb/mfg/WorkOrdRcpDet.java

@@ -315,40 +315,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 
 						}
 					}
-					else if(childNodeName.equalsIgnoreCase("loc_code"))
-					{
-						locCode = genericUtility.getColumnValue("loc_code",dom2);
-
-						if (locCode == null || locCode.trim().length() == 0)
-						{
-							errCode = "WORDWLCNU";
-							errString = getErrorString("loc_code",errCode,userId);
-							break;
-						}
-						else
-						{
-
-							sql = "select count(1) from location where loc_code = ?";
-							pstmt=conn.prepareStatement(sql);
-							pstmt.setString(1,locCode);
-							rs = pstmt.executeQuery();
-							if(rs.next())
-							{
-								cnt = rs.getInt(1);
-							}
-							pstmt.close();
-							rs.close();
-							pstmt = null;
-							rs = null;
-							if(cnt == 0)
-							{
-								errCode = "WORDWLCNE";
-								errString = getErrorString("loc_code",errCode,userId);
-								break;
-							}
-
-						}
-					}
+					
 
 					/*else if(childNodeName.equalsIgnoreCase("no_art"))
 					{
@@ -542,6 +509,40 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 
 						}
 					}
+					else if(childNodeName.equalsIgnoreCase("loc_code"))
+					{
+						locCode = genericUtility.getColumnValue("loc_code",dom2);
+
+						if (locCode == null || locCode.trim().length() == 0)
+						{
+							errCode = "WORDWLCNU";
+							errString = getErrorString("loc_code",errCode,userId);
+							break;
+						}
+						else
+						{
+
+							sql = "select count(1) from location where loc_code = ?";
+							pstmt=conn.prepareStatement(sql);
+							pstmt.setString(1,locCode);
+							rs = pstmt.executeQuery();
+							if(rs.next())
+							{
+								cnt = rs.getInt(1);
+							}
+							pstmt.close();
+							rs.close();
+							pstmt = null;
+							rs = null;
+							if(cnt == 0)
+							{
+								errCode = "WORDWLCNE";
+								errString = getErrorString("loc_code",errCode,userId);
+								break;
+							}
+
+						}
+					}
 
 
 				}
@@ -880,7 +881,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 							valueXmlString.append("<mfg_date>").append("<![CDATA[" + sMfgDateStart + "]]>").append("</mfg_date>");
 							sql = "select qc_reqd from siteitem where site_code = ? and item_code = ?";
 							pstmt=conn.prepareStatement(sql);
-							pstmt.setString(1,loginSite);
+							pstmt.setString(1,woSiteCode);
 							pstmt.setString(2,itemCode);
 							rs = pstmt.executeQuery();
 							if(rs.next())