itm_default site_code was coming blank, corrected

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

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

@@ -193,6 +193,7 @@ public class WoContract extends ValidatorEJB implements WoContractLocal, WoContr
 						{
 							sql = " select count(*) from bomdet,workorder "
 								+ " where workorder.bom_code = bomdet.bom_code  "
+								+ " and case when BOMDET.auto_ord is null then 'N' else BOMDET.auto_ord end = 'Y' "
 								+ " and workorder.work_order = ? "
 								+ " and bomdet.item_code = ? " ;
 							
@@ -258,6 +259,7 @@ public class WoContract extends ValidatorEJB implements WoContractLocal, WoContr
 								+ " FROM WORKORDER,BOMDET,PCONTRACT_HDR,PCONTRACT_DET "
 								+ " WHERE WORKORDER.BOM_CODE = BOMDET.BOM_CODE "
 								+ " AND BOMDET.ITEM_CODE = PCONTRACT_DET.ITEM_CODE "
+								+ " and case when BOMDET.auto_ord is null then 'N' else BOMDET.auto_ord end = 'Y' "
 								+ " and workorder.work_order = ? "
 								+ " and PCONTRACT_DET.CONTRACT_NO = ? " ;
 							pstmt = conn.prepareStatement(sql);
@@ -433,10 +435,15 @@ public class WoContract extends ValidatorEJB implements WoContractLocal, WoContr
 				System.out.println("[" + currentColumn + "] ==> '" + columnValue + "'");
 				if((currentColumn.trim().equalsIgnoreCase("itm_default")))
 				{
-					loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
+					siteCode = genericUtility.getColumnValue("site_code",dom);
+					if (siteCode == null || siteCode.trim().length() == 0)
+					{
+						siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
+						valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>");	
+					}
 					sql = " select descr from site where site_code = ? " ;
 					pstmt = conn.prepareStatement(sql);
-					pstmt.setString(1,loginSite);
+					pstmt.setString(1,siteCode);
 					rs = pstmt.executeQuery();
 					if(rs.next())
 					{
@@ -446,7 +453,6 @@ public class WoContract extends ValidatorEJB implements WoContractLocal, WoContr
 					rs = null;
 					pstmt.close();
 					pstmt = null;
-					valueXmlString.append("<site_code> ").append("<![CDATA["+loginSite+"]]>").append("</site_code>");	
 					valueXmlString.append("<site_descr>").append("<![CDATA["+siteDescr+"]]>").append("</site_descr>");	
 					// 14/01/14 manoharan set default as blank so that for all rubber stereo the same contract wil be used
 					valueXmlString.append("<item_code>").append("<![CDATA[X]]>").append("</item_code>");