Commit f67abb82 authored by caluka's avatar caluka

No of batches changes then 3rd screen demand display quantity basis


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98287 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5efbf34f
......@@ -123,6 +123,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
String tranidIncrement="";
String bomCode="",mpsOrder="",yield="";
String roundingRequired="",bomLevel="";
String revDemand = "",siteItemQtyList = "";
Document argDom = null;
java.sql.Timestamp sysDate = new java.sql.Timestamp(System.currentTimeMillis());
......@@ -236,8 +237,6 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
pstmt.setString(2, siteCodeTo);
pstmt.setTimestamp(3, dbDateFromTime);
pstmt.setTimestamp(4, dbDateToTime);
//pstmt.setString(3, dbDateFrom);
//pstmt.setString(4, dbDateTo);
rs = pstmt.executeQuery();
while (rs.next())
{
......@@ -614,21 +613,28 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
{
siteCode = checkNull(genericUtility.getColumnValueFromNode( "site_code", parentNodeList.item(ctr1) ));
itemCode = checkNull(genericUtility.getColumnValueFromNode( "item_code", parentNodeList.item(ctr1) ));
revDemand = checkNull(genericUtility.getColumnValueFromNode( "quantity", parentNodeList.item(ctr1) ));
System.out.println("siteCode=="+siteCode+"itemCode=="+itemCode);
System.out.println("ctr1=="+ctr1);
if(ctr1 > 0)
{
siteItemList = siteItemList + ",'"+siteCode.trim()+itemCode.trim()+"'" ;
siteList = siteList + ",'"+siteCode.trim()+"'" ;
//siteItemQtyList = siteItemQtyList + ",'"+siteCode.trim()+itemCode.trim()+"@"+revDemand+"'" ;
siteItemQtyList = siteItemQtyList + ","+siteCode.trim()+itemCode.trim()+"@"+revDemand ;
}
else
{
siteItemList = "'"+siteCode.trim()+itemCode.trim()+"'" ;
siteList = "'"+siteCode.trim()+"'" ;
//siteItemQtyList = "'"+siteCode.trim()+itemCode.trim()+"@"+revDemand+"'" ;
siteItemQtyList = siteCode.trim()+itemCode.trim()+"@"+revDemand ;
}
System.out.println("siteItemList=="+siteItemList);
System.out.println("siteList=="+siteList);
System.out.println("siteItemQtyList=="+siteItemQtyList);
}
StringBuffer argData = new StringBuffer();
......@@ -638,6 +644,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
argData.append("<date_from>").append(fromDate).append("</date_from>\r\n");
argData.append("<date_to>").append(toDate).append("</date_to>\r\n");
argData.append("<site_item_list>").append(siteItemList).append("</site_item_list>\r\n");//chandrashekar 0n 19-03-2014
argData.append("<site_item_qtylist>").append(siteItemQtyList).append("</site_item_qtylist>\r\n");
argData.append("<site_list>").append(siteList).append("</site_list>\r\n");//chandrashekar on 10-07-2014
argData.append("<site_code__from>").append(siteCodeFr).append("</site_code__from>\r\n");
argData.append("<site_code__to>").append(siteCodeTo).append("</site_code__to\r\n>");
......
......@@ -151,6 +151,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String itemCodeList = "0";//Manoj dtd 17/10/2013
boolean isDetailReq = false;//Manoj dtd 17/10/2013
String siteItemList = "0";//chandrashekar 0n 04/04/2014
String siteItemQtyList = "";
String siteList = "0";//chandrashekar 0n 10/07/2014
boolean isRequirement = false;//Chandrashekar 04/04/2014
......@@ -219,6 +220,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String soItemList="";
String roundingRequired="";
int bomLevel=0;
String[] arrStr = null;
public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException
{
System.out.println("Called process(string, string).....");
......@@ -333,6 +335,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//sorderList= genericUtility.getColumnValue("sale_order_list", dom);
itemCodeList = genericUtility.getColumnValue("item_code_list", dom); // added by cpatil
siteItemList = genericUtility.getColumnValue("site_item_list", dom); //added by chandrashekar
siteItemQtyList = genericUtility.getColumnValue("site_item_qtylist", dom);
arrStr =siteItemQtyList.split(",");
siteList = genericUtility.getColumnValue("site_list", dom); //added by chandrashekar
itemCodeOnlyList = genericUtility.getColumnValue("item_code_only_list", dom); // added by cpatil
//cpatil-25/08/14-System.out.println("siteList@@@@@@"+siteList);
......@@ -3889,6 +3894,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
java.sql.Timestamp dueDate = null;
String itemCode = null;
String siteCode = null;
String SiteItemComb = "";
String siteItemTempList = "";
String siteItemMatchValue = "";
String revisedQtyStr = "";
// 12/04/10 manoharan MF90BHU001
double stockQty = 0;
double othSupply = 0;
......@@ -3928,6 +3937,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double prevpendIndQty=0;
double prevpendDRQty=0;
double qtStk=0;//added by Chandrashekar 0n 11-08-14
double revisedQty = 0.0;
try
{
......@@ -4060,6 +4070,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// System.out.println("Query Executed for item : " + itemCode);
String rsItemCode = "", adpItemcode = "";
SiteItemComb = siteCode.trim()+itemCode.trim();
while (rs.next())
{
System.out.println("@@@@@@3766 sql executed.....");
......@@ -4068,7 +4079,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
rsItemCode = rs.getString(1);// Added by JIten 02/11/06 as per
// Manoharan Sir
dueDate = rs.getTimestamp(2);
if(!isRequirement)//Added by chandrashekar on 15-07-2015
{
demand = rs.getDouble(3);
}
supply = rs.getDouble(4);
// 12/04/10 manoharan MF90BHU001 stock and other supply to be
// separated
......@@ -4085,6 +4099,41 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(isRequirement)
{
qtStk = rs.getDouble(12);
int len =arrStr.length;
for(int i =0;i<len;i++)
{
siteItemTempList =arrStr[i];
String tempItemLstArr[]=siteItemTempList.split("@");
if( tempItemLstArr.length > 0 )
{
siteItemMatchValue=tempItemLstArr[0];
}
if( tempItemLstArr.length > 1 )
{
revisedQtyStr=tempItemLstArr[1];
if (revisedQtyStr != null && revisedQtyStr.trim().length() > 0)
{
try
{
revisedQty = Double.parseDouble(revisedQtyStr);
} catch (NumberFormatException n)
{
revisedQty = 0;
}
}
}
System.out.println("siteItemMatchValue>>>>>>"+siteItemMatchValue);
System.out.println("SiteItemComb>>>>>>"+SiteItemComb);
if(siteItemMatchValue.equalsIgnoreCase(SiteItemComb))
{
demand = revisedQty;
System.out.println("final demand>>>>"+revisedQty);
break;
}
}
}
//cpatil-25/08/14-System.out.println("isDetailReq3------"+isDetailReq);
if(isDetailReq)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment