org_structure and org_structure_cust join added in pohelp query and validation

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

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

@@ -466,8 +466,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 										}else
 										{
 										sql="select count(*)  " +
-												"from org_structure_cust orgcust,customer cust ,station stn,customer_series custser," +
-												"state state where  orgcust.cust_code=cust.cust_code and cust.stan_code=stn.stan_code" +
+												"from org_structure org,org_structure_cust orgcust,customer cust ,station stn,customer_series custser," +
+												"state state where org.version_id=orgcust.version_id and " +
+												"org.pos_code=orgcust.pos_code and org.table_no=orgcust.table_no and " +
+												"orgcust.cust_code=cust.cust_code and cust.stan_code=stn.stan_code" +
 												"  and custser.cust_code=cust.cust_code and custser.black_listed !='Y' " +
 												"and custser.item_ser=(select item_ser from department where dept_code in " +
 												"(select dept_code from employee where emp_code=?)) " +
@@ -1627,7 +1629,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 					valueXmlString.append("<sordertype_descr protect='1'>").append("<![CDATA[" + orderTypeName + "]]>").append("</sordertype_descr>");
 					valueXmlString.append("<stmt_date>").append("<![CDATA[" + stmtDateStr + "]]>").append("</stmt_date>");
 					valueXmlString.append("<status>").append("<![CDATA[O]]>").append("</status>");
-					valueXmlString.append("<prd_code>").append("<![CDATA[" + period + "]]>").append("</prd_code>");
+					valueXmlString.append("<prd_code protect='1'>").append("<![CDATA[" + period + "]]>").append("</prd_code>");
 					valueXmlString.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
 					valueXmlString.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
 					valueXmlString.append("<chg_date>").append("<![CDATA[" + sdf.format(currentDate) + "]]>").append("</chg_date>");