Skip to content

B
business-java
Commit d3bd31ad authored by cpatil's avatar cpatil
Browse files
Options

modify at urse supreme 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97719 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 491dcabd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 14795 additions and 14119 deletions
webitm-mfg/ibase/webitm/ejb/mfg/ADPElement.java
View file @ d3bd31ad
......@@ -104,6 +104,58 @@ class ADPElement implements Cloneable
private double soDemand=0;
private double grossWeight = 0;
private String altitemPerc;
private double reorderLevel=0;
private double reordPlanQty=0;
public void setDemand(double demand)
{
this.demand=demand;
}
/*public double getDemand()
{
return this.demand;
}*/
public void setSupply(double supply)
{
this.supply=supply;
}
/*public double getSupply()
{
return this.supply;
}*/
public double getReordPlanQty()
{
return this.reordPlanQty;
}
/*public double getDemand()
{
return this.demand;
}*/
public void setReordPlanQty(double reordPlanQty)
{
this.reordPlanQty=reordPlanQty;
}
public void SetTimeMRPArr(ArrayList timeMRPArr)
{
this.timeMRPArr=timeMRPArr;
}
public ArrayList<TimeMRP> getTimeMRPArr()
{
return this.timeMRPArr;
}
public void setReorderLevel(double reorderLevel)
{
this.reorderLevel=reorderLevel;
}
public double getReorderLevel()
{
return this.reorderLevel;
}
public void setAltitemPerc(String altitemPerc)
{
......@@ -350,8 +402,17 @@ class ADPElement implements Cloneable
public void setSupply(java.sql.Timestamp dueDate, double supply)
{
this.supply += supply;
System.out.println("@@@@@020415:::this.reorderLevel["+this.reorderLevel+"]");
//updateTimeMrp(dueDate, 0, supply, 0, 0," "," ");
/*if(this.reorderLevel>0)
{
updateTimeMrp(dueDate, 0, supply, 0, 0,reorderLevel);
}
else
{*/
updateTimeMrp(dueDate, 0, supply, 0, 0);
//}
}
public double getSupply()
{
......@@ -835,6 +896,106 @@ class ADPElement implements Cloneable
errString = e.getMessage();
}
}
private void updateTimeMrp(java.sql.Timestamp dueDate, double demand, double supply, double stockQty, double othSupply,double reorderLevel)
{
String errString = "";
TimeMRP timeMRP = null;
genericUtility = GenericUtility.getInstance();
int timeEle = -1, ctr;
SimpleDateFormat sdt=new SimpleDateFormat("yyyy-MM-dd");
dueDate = java.sql.Timestamp.valueOf(sdt.format(dueDate) + " 00:00:00.000");
System.out.println("618---timeMRPArr.size() "+timeMRPArr.size() +"----"+dueDate+"---"+demand+"----"+supply+"----"+stockQty);
try
{
timeEle = -1;
if (timeMRPArr.size() > 0)
{
for (ctr = 0; ctr < timeMRPArr.size(); ctr++)
{
timeMRP = (TimeMRP)timeMRPArr.get(ctr);
//if (timeMRP.getDueDate() != null && timeMRP.getSaleOrder().equals(saleOrder) && timeMRP.getLineNo().equals(lineNo))
System.out.println("772--timeMRP.getDueDate()["+timeMRP.getDueDate()+"]");
if (timeMRP.getDueDate() != null)
{
if (timeMRP.getDueDate().equals(dueDate))
{
timeEle = ctr;
break;
}
}
}
}
System.out.println("637---timeEle---"+timeEle);
if (timeEle == -1)
{
timeMRP = new TimeMRP();
timeMRP.setDueDate(dueDate);
//added by sabyasachi 29.03.2011
//timeMRP.setDemand(demand,saleOrder,lineNo);
System.out.println("@@@@@@@@@@@ timeMRP -1 setdemand["+demand+"]");
if( demand > 0 )
{
System.out.println("@@@@@010415:::demand["+demand+"]supply["+supply+"]-reorderLevel["+reorderLevel+"]");
timeMRP.setDemand( demand - supply + reorderLevel ) ;
System.out.println("@@@@@010415:::tmp.getDemand()["+timeMRP.getDemand()+"]");
//tmp.setRunningDemand(reorderLevel);
timeMRP.setRunningDemand( demand - supply + reorderLevel );
System.out.println("@@@@@010415:::tmp.getRunningDemand()["+timeMRP.getRunningDemand()+"]");
}
// timeMRP.setDemand(demand);
//end added by sabyasachi 29.03.2011
timeMRP.setSupply(supply);
// 12/04/10 manoharan MF90BHU001
timeMRP.setStockQty(stockQty);
timeMRP.setOthSupply(othSupply);
// end 12/04/10 manoharan MF90BHU001
this.timeMRPArr.add(timeMRP);
}
else
{
timeMRP = (TimeMRP)this.timeMRPArr.get(timeEle);
//added by sabyasachi 29.03.2011
//timeMRP.setDemand(demand,saleOrder,lineNo);
System.out.println("before setDemand() [" + demand + "] supply [" + supply + "]" );
if( demand > 0 )
{
System.out.println("@@@@@010415:::demand["+demand+"]supply["+supply+"]-reorderLevel["+reorderLevel+"]");
timeMRP.setDemand( demand - supply + reorderLevel ) ;
System.out.println("@@@@@010415:::tmp.getDemand()["+timeMRP.getDemand()+"]");
//tmp.setRunningDemand(reorderLevel);
timeMRP.setRunningDemand( demand - supply + reorderLevel );
System.out.println("@@@@@010415:::tmp.getRunningDemand()["+timeMRP.getRunningDemand()+"]");
}
//timeMRP.setDemand(demand);
//end added by sabyasachi 29.03.2011
timeMRP.setSupply(supply);
System.out.println("after setSupply()" );
// 12/04/10 manoharan MF90BHU001
timeMRP.setStockQty(stockQty);
timeMRP.setOthSupply(othSupply);
// end 12/04/10 manoharan MF90BHU001
//timeMRP.setSaleOrder(saleOrder);
//timeMRP.setLineNo(lineNo);
this.timeMRPArr.set(timeEle,timeMRP);
}
System.out.println("before updateRunningDemandSupply()" );
updateRunningDemandSupply(dueDate);
System.out.println("after updateRunningDemandSupply()" );
}
catch(Exception e)
{
System.out.println("Exception :adpeLEMENT : updateTimeMrp(Date, supply, demand):...." + e.getMessage() + ":");
errString = genericUtility.createErrorString(e);
e.printStackTrace();
errString = e.getMessage();
}
}
private void updateRunningDemandSupply(java.sql.Timestamp dueDate)
{
int index = 0;
......
webitm-mfg/ibase/webitm/ejb/mfg/MRPWizardXmlDataBean.java
View file @ d3bd31ad
......@@ -102,14 +102,12 @@ public class MRPWizardXmlDataBean
HashMap detail4ListMap = new HashMap();
//System.out.println("@@@ initiaalize detail4ListMap...");
String locGroup="",mfgType="",other="",grossWeight="",netReq="",orderType="",currentSorder="",itemDetailsInfo="";
String sodemand="";
int nextDomId = 0;
String altItemPerc="";
int nextDomId = 0,soItemListCnt=0;
String altItemPerc="",soItemList="",itemCodeSuppDescr="",locGroupList="";
try
{
conn = connDriver.getConnectDB("DriverITM");
......@@ -159,6 +157,7 @@ public class MRPWizardXmlDataBean
if("line_no".equalsIgnoreCase( refrenceNode.getNodeName()))
{
lineNo = refrenceNode.getTextContent();
System.out.println("@@@@@@@@ lineNo["+lineNo+"] found....");
}
if("item_code".equalsIgnoreCase( refrenceNode.getNodeName()))
{
......@@ -172,6 +171,12 @@ public class MRPWizardXmlDataBean
{
bomCodeRef = refrenceNode.getTextContent();
}
if("loc_group".equalsIgnoreCase( refrenceNode.getNodeName()))
{
locGroup = refrenceNode.getTextContent();
System.out.println("@@@@@@@@ locGroup["+locGroup+"] found....");
}
String LineNo = "",QtyReqd = "",ItemCodeDescr = "",AvailableSupply = "",OriginalOrAltitem = "";
......@@ -375,6 +380,42 @@ public class MRPWizardXmlDataBean
}
}
// start 24/03/15 in urse by cpatil
System.out.println("soItemListCnt["+soItemListCnt+"]saleOrder["+saleOrder+"]itemCode["+itemCode+"]soItemList["+soItemList+"]locGroup["+locGroup+"]");
if( saleOrder != null && saleOrder.trim().length() > 0 && itemCode != null && itemCode.trim().length() > 0)
{
if(!( soItemList.contains(saleOrder+"@"+itemCode) ))
{
if(soItemListCnt > 0)
{
soItemList = soItemList + ","+saleOrder+"@"+itemCode+"" ;
soItemListCnt++;
}
else
{
soItemList = saleOrder+"@"+itemCode ;
soItemListCnt++;
}
}
}
System.out.println("@@@@@@ final :::soItemList in recalculate::["+soItemList+"]");
if( saleOrder != null && saleOrder.trim().length() > 0 && locGroup != null && locGroup.trim().length() > 0)
{
if( locGroupList != null && locGroupList.trim().length() > 0)
{ //locGroupList = locGroupList + ",'"+saleOrder+itemCode+"@"+locGroup+"'" ;
locGroupList = locGroupList + ","+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ;
}
else
{
//locGroupList = "'"+saleOrder+itemCode+"@"+locGroup+"'" ;
locGroupList = ""+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ;
}
}
System.out.println("@@@@@@ final :::locGroupList in recalculate::["+locGroupList+"]");
// end
System.out.println("detail4OuterList["+detail4OuterList+"]");
if( detail4OuterList != null && detail4OuterList.size() > 0 )
......@@ -532,7 +573,7 @@ public class MRPWizardXmlDataBean
}
// }
System.out.println("@@@@ saleOrder["+saleOrder+"]-lineNo["+lineNo+"]-qtyReqd["+qtyReqdStr+"]sourceSupply["+sourceSupply+"]@@@");
System.out.println("@@@@ saleOrder["+saleOrder+"]-lineNo["+lineNo+"]-qtyReqd["+qtyReqdStr+"]sourceSupply["+sourceSupply+"]locGroup["+locGroup+"]@@@");
System.out.println("@@@@ siteCode["+siteCode+"]-itemCode["+itemCode+"]-bomCodeOrg["+bomCodeOrg+"]-bomCodeRef["+bomCodeRef+"]bomCodeParent["+bomCodeParent+"]");
System.out.println("@@@@@ itemCodeDetailMap in bean itemCodeDetailMapStr["+itemCodeDetailMapStr+"]bomCodeRef["+bomCodeRef+"]");
System.out.println("@@@@@ itemCodeDetailMap in bean deleteBomList["+deleteBomList+"]deleteSaleOrderList["+deleteSaleOrderList+"]");
......@@ -542,7 +583,9 @@ public class MRPWizardXmlDataBean
itemCodeDetailMapStr = bomCodeParent;
}
System.out.println("@@@@@ itemCodeDetailMap in bean itemCode["+itemCode+"]bomCodeParent["+bomCodeParent+"]deleteBomList["+deleteBomList+"]deleteSaleOrderList["+deleteSaleOrderList+"]saleOrder@lineNo["+saleOrder+"@"+lineNo+"]bomCodeRef["+bomCodeRef+"]bomCodeOrg["+bomCodeOrg+"]");
if( !( ( deleteBomList.contains(bomCodeParent.trim()) ) && deleteSaleOrderList.contains(saleOrder+"@"+lineNo)) )
//if( !( ( deleteBomList.contains(bomCodeParent.trim()) ) && deleteSaleOrderList.contains(saleOrder+"@"+lineNo)) )
if( !( deleteBomList.contains(bomCodeParent.trim()) ) )
{ // ||
System.out.println("@@@@@ itemCodeDetailMapitemCode["+itemCode+"]deleteBomList["+deleteBomList+"]bomCodeOrg["+bomCodeOrg+"]");
//if( !(deleteBomList.contains(bomCodeOrg)) )
......@@ -557,7 +600,7 @@ public class MRPWizardXmlDataBean
&& ( !bomCodeOrg.equalsIgnoreCase(bomCodeRef)) ) )
{
System.out.println("@@@@@@@@ before recalcilate valueXmlString ["+valueXmlString.toString()+"]");
System.out.println("@@@@@@@@ before recalculate valueXmlString ["+valueXmlString.toString()+"]soItemList["+soItemList+"]locGroupList["+locGroupList+"]");
System.out.println("14/06/14 supreme 2 inside itemCode ["+itemCode+"]bomCodeRef["+bomCodeRef+"] suppSour [" + suppSour+"]bomCodeOrg["+bomCodeOrg+"]");
System.out.println("14/06/14 Before recalculate itemCode {" + itemCode +"] bomCodeRef [" + bomCodeRef + "] bomCodeParent [" + bomCodeParent+ "]dueDate["+dueDate+"]" );
......@@ -599,9 +642,6 @@ public class MRPWizardXmlDataBean
argData.append("<bom_code>").append(bomCodeRef).append("</bom_code>\r\n"); // added by cpatil on 17/05/14 for BomReplace
argData.append("<bomReplaceDemand>").append(qtyReqdStr).append("</bomReplaceDemand>\r\n"); // added by cpatil on 17/05/14 for BomReplace
//argData.append("<date_from>").append(simpleDateFormat.format(new Date())).append("</date_from>\r\n"); // 01-10-2007
//argData.append("<date_to>").append(simpleDateFormat.format(new Date())).append("</date_to>\r\n"); // 01-10-2007
......@@ -621,6 +661,9 @@ public class MRPWizardXmlDataBean
argData.append("<item_ser__to>").append("ZZ").append("</item_ser__to>\r\n");
argData.append("<item_code_list>").append("").append("</item_code_list>\r\n");
argData.append("<soItemList>").append("<![CDATA[").append(soItemList).append("]]>").append("</soItemList>\r\n");
argData.append("<locGroupList>").append("<![CDATA[").append(locGroupList).append("]]>").append("</locGroupList>\r\n");
argData.append("</Detail>");
argData.append("</Root>");
......@@ -692,6 +735,7 @@ public class MRPWizardXmlDataBean
sourceSupply = "";
siteCodeSupp = "";
itemCodeSupp = "";
itemCodeSuppDescr="";
itemCodeDescr = "";
lotNo = "";
lotSl = "";
......@@ -739,7 +783,7 @@ public class MRPWizardXmlDataBean
sourceSupply = "";
siteCodeSupp = "";
itemCodeSupp = "";
itemCodeDescr = "";
itemCodeSuppDescr = "";
lotNo = "";
lotSl = "";
locCode = "";
......@@ -815,11 +859,11 @@ public class MRPWizardXmlDataBean
{
if( detail4Node.getFirstChild() != null)
{
itemCodeDescr = detail4Node.getFirstChild().getNodeValue();
itemCodeSuppDescr = detail4Node.getFirstChild().getNodeValue();
}
else
{
itemCodeDescr="";
itemCodeSuppDescr="";
}
//itemCodeDescr = detail4Node.getFirstChild().getNodeValue();
}
......@@ -1015,7 +1059,7 @@ public class MRPWizardXmlDataBean
valueXmlString.append("<source_supply protect = '1'>").append("<![CDATA[" + sourceSupply + "]]>").append("</source_supply>\r\n");
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCodeSupp + "]]>").append("</item_code>\r\n");
valueXmlString.append("<item_code_descr protect = '1'>").append("<![CDATA[" + itemCodeDescr + "]]>").append("</item_code_descr>\r\n");
valueXmlString.append("<item_code_descr protect = '1'>").append("<![CDATA[" + itemCodeSuppDescr + "]]>").append("</item_code_descr>\r\n");
valueXmlString.append("<lot_no protect = '1'>").append("<![CDATA[" + lotNo + "]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl protect = '1'>").append("<![CDATA[" + lotSl + "]]>").append("</lot_sl>\r\n");
valueXmlString.append("<loc_code protect = '1'>").append("<![CDATA[" + locCode + "]]>").append("</loc_code>\r\n");
......@@ -1202,7 +1246,7 @@ public class MRPWizardXmlDataBean
}
}
System.out.println("14/06/14 After recalculate itemCode {" + itemCode +"] bomCodeRef [" + bomCodeRef + "] bomCodeParent [" + bomCodeParent+ "]itemCodeDetailMapStr["+itemCodeDetailMapStr+"]" );
////////////////////////////////////////////////////////
System.out.println("13/06/14 reference qtyReqdStr before["+qtyReqdStr+"]demand["+demand+"]sodemand["+sodemand+"]");
if (sodemand == null || "null".equals(sodemand) || sodemand.trim().length() == 0 )
{
......@@ -1393,6 +1437,10 @@ public class MRPWizardXmlDataBean
//}
}
else
{
System.out.println("@@@@@@this item code deletedc from display --> itemCode["+itemCode+"]qtyReqdStr["+qtyReqdStr+"]deleteBomList["+deleteBomList+"]bomCodeParent["+bomCodeParent+"]");
}
//}
//}
//}
......
webitm-mfg/ibase/webitm/ejb/mfg/MrpWizPrsSaveBean.java
View file @ d3bd31ad
......@@ -690,18 +690,29 @@ public class MrpWizPrsSaveBean
System.out.println("@@@@@ sorderArray.length["+sorderArray.length+"]");
for(int i=0;i<sorderArray.length;i++)
{
String tempSO=sorderArray[i];
System.out.println("@@@@@::: sorder ["+tempSO+"] updated next i["+i+"]....");
String tempSO="",tempLineNo="";
tempSO=sorderArray[i];
sql2 = " update sorder set alloc_flag = 'Y' where sale_order = ? ";
String sorderLineArray[]=tempSO.split(",");
System.out.println("@@@@@ sorderArray.length["+sorderArray.length+"]");
if( sorderLineArray.length > 1)
{
tempSO=sorderLineArray[0];
tempLineNo=sorderLineArray[1];
}
System.out.println("@@@@@::: sorder ["+tempSO+"]tempLineNo["+tempLineNo+"] updated next i["+i+"]....");
sql2 = " update sorditem set alloc_flag = 'Y' where sale_order = ? and ltrim(rtrim(line_no)) = ? ";
System.out.println("sql2 :"+sql2 );
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,tempSO);
pstmt2.setString(2,tempLineNo);
int cnt2 = pstmt2.executeUpdate();
pstmt2.close();
pstmt2 = null;
System.out.println("@@@@@ cnt ["+cnt2+"]::: sorder ["+tempSO+"] alloc_flag [ Y ] updated sucessfully");
System.out.println("@@@@@ cnt ["+cnt2+"]:::sorditem:::sorder["+tempSO+"]tempLineNo["+tempLineNo+"]alloc_flag[Y]updated sucessfully");
}
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPWiz.java
View file @ d3bd31ad
......@@ -119,7 +119,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
int cnt;
//int cnt;
System.out.println("childNodeName 0. : " + childNodeName);
if (childNodeName.equals("date_to"))
{
......@@ -149,6 +149,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
}
if (childNodeName.equals("site_code__to"))
{
if (childNode.getFirstChild() == null || genericUtility.getColumnValue("site_code__from",dom) == null)
{
errCode = "VMRPSITE1";
......@@ -165,6 +166,100 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
break;
}
count = 0;
//for validate site for perticular user added on 20/03/15 urse start@@@@@@@@@
String loginId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
if (siteCodeFrom != null && siteCodeFrom.trim().length() > 0)
{
sql = "SELECT COUNT(*) COUNT FROM SITE WHERE SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCodeFrom);
rs = pstmt.executeQuery();
if (rs.next())
{
count = rs.getInt("COUNT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (count == 0)
{
errCode = "VMSITEFR";
errString = getErrorString(childNodeName, errCode, userId);
break;
}
count = 0;
sql = "SELECT COUNT(*) COUNT FROM USER_SITE WHERE USER_ID = ? AND SITE_CODE= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginId);
pstmt.setString(2, siteCodeFrom);
rs = pstmt.executeQuery();
if (rs.next())
{
count = rs.getInt("COUNT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (count == 0)
{
errCode = "INVUSRSITE";
errString = getErrorString(childNodeName, errCode, userId);
break;
}
}
if (siteCodeTo != null && siteCodeTo.trim().length() > 0)
{
sql = "SELECT COUNT(*) COUNT FROM SITE WHERE SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCodeTo);
rs = pstmt.executeQuery();
if (rs.next())
{
count = rs.getInt("COUNT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (count == 0)
{
errCode = "VMSITETO";
errString = getErrorString(childNodeName, errCode, userId);
break;
}
count=0;
sql = "SELECT COUNT(*) COUNT FROM USER_SITE WHERE USER_ID = ? AND SITE_CODE= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginId);
pstmt.setString(2, siteCodeTo);
rs = pstmt.executeQuery();
if (rs.next())
{
count = rs.getInt("COUNT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (count == 0)
{
errCode = "INVUSRSITE";
errString = getErrorString(childNodeName, errCode, userId);
break;
}
}
// end
}
......@@ -234,7 +329,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
String childNodeName = null;
String sql = "";
String siteCodeTo = "" , siteCodeFr = "" ,saleOrder = "" ,itemCode = "" , siteCode = "" ;
String mrpGetData = "", itemCodeList = "" , winName = "", saleOrderList="";
String mrpGetData = "", itemCodeList = "" , winName = "", saleOrderList="", soItemList = "";
StringBuffer valueXmlString = new StringBuffer();
int ctr = 0 , currentFormNo = 0 ,lineNo = 0 ,domID = 0;
java.sql.Timestamp dateTo = null ,dateFr = null;
......@@ -420,7 +515,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
sql=" select a.sale_order,a.line_no,a.site_code,a.item_code,a.due_date,a.cust_code,a.cust_name," +
"a.quantity,a.unit,a.type,a.order_due_date , a.order_date ,a.mfg_type " +
" a.quantity,a.unit,a.type,a.order_due_date , a.order_date ,a.mfg_type " +
" from ( " +
" SELECT sorditem.sale_order as sale_order,sorditem.line_no as line_no," +
" sorditem.site_code as site_code," +
......@@ -441,7 +536,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
//" and (sorditem.due_date >= ? ) and (sorditem.due_date <= ? )" +
" and ( case when sorder.status is null then 'P' else sorder.status end = 'P')" +
" and (sorder.cust_code = customer.cust_code )" +
" and case when sorder.alloc_flag is null then 'N' else sorder.alloc_flag end <> 'Y' " +
//" and case when sorder.alloc_flag is null then 'N' else sorder.alloc_flag end <> 'Y' " +
" and case when sorditem.alloc_flag is null then 'N' else sorditem.alloc_flag end <> 'Y' " +
" and ( siteitem.item_code = item.item_code ) and ( siteitem.site_code = sorditem.site_code ) " ;
if("order_date".equalsIgnoreCase(viewByDate))
......@@ -484,7 +580,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
sql = sql+" and ( (mps_order.ord_date >= ? and mps_order.ord_date <= ? ) or (mps_order.due_date >= ? and mps_order.due_date <= ? ) ) ";
}
sql = sql + " ) a ";
sql = sql + " ) a where a.quantity > 0 ";
if("order_date".equalsIgnoreCase(viewByDate))
{
......@@ -616,7 +712,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
//locGroupList = locGroupList + ",'"+saleOrder+itemCode+"@"+locGroup+"'" ;
locGroupList = locGroupList + ","+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ;
soItemList = soItemList + ","+saleOrder+"@"+itemCode+"" ;
}
else
{
......@@ -625,12 +721,12 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
//locGroupList = "'"+saleOrder+itemCode+"@"+locGroup+"'" ;
locGroupList = ""+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ;
soItemList = saleOrder+"@"+itemCode ;
}
System.out.println("itemCodeList=="+itemCodeList);
System.out.println("itemCodeOnlyList=="+itemCodeOnlyList);
System.out.println("locGroupList=="+locGroupList);
System.out.println("soItemList=="+soItemList);
orderType= checkNull(genericUtility.getColumnValueFromNode( "order_type", detail2List.item(ctr1) ));
System.out.println("inside for orderType["+orderType+"]");
......@@ -690,6 +786,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
System.out.println("@@@@@@@@:: order_type["+orderType+"]");
// xmlString.append("<site_code>").append("<![CDATA[").append(siteCode).append("]]>").append("</site_code>");
argData.append("<locGroupList>").append("<![CDATA[").append(locGroupList).append("]]>").append("</locGroupList>\r\n");
argData.append("<soItemList>").append("<![CDATA[").append(soItemList).append("]]>").append("</soItemList>\r\n");
argData.append("</Detail>");
argData.append("</Root>");
......
webitm-mfg/ibase/webitm/ejb/mfg/WorderCampaign.java
View file @ d3bd31ad
......@@ -352,6 +352,7 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
String wostatus="",workorder="",chgTerm="",chgUser="",utranid="";
GenericUtility genutility = null;
HashMap<String, String> comMap=new HashMap<String, String>();
String campItemWise="";
try {
connDriver = new ConnDriver();
......@@ -361,6 +362,21 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
itmDBAccessEJB = new ITMDBAccessEJB();
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
// added by cpatil on 23/03/15 in urse for supreme start
sql = " SELECT VAR_VALUE FROM MFGPARM WHERE PRD_CODE ='999999' AND VAR_NAME ='CAMP_ITEM_WISE' ";
pstmt=conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
campItemWise = rs.getString(1) == null ? "":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
System.out.println("@@@@@@ campItemWise["+campItemWise+"]");
//added by cpatil on 23/03/15 in urse for supreme end
parentNodeList = detailDom.getElementsByTagName("Detail2");
for (int i = 0; i < parentNodeList.getLength(); i++) {
parentNode = parentNodeList.item(i);
......@@ -414,10 +430,19 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
rs.close();
pstmt = null;
rs = null;
if(campItemWise != null && "N".equalsIgnoreCase(campItemWise)) // added condition for supreme MFGPARM 'CAMP_ITEM_WISE' define as 'N' value
{
if(utranid.trim().length() <= 0)
{
utranid = generateTranId("w_wocampaign", loginSite, conn);
}
}
else if("Y".equalsIgnoreCase(campItemWise) || campItemWise == null || "".equalsIgnoreCase(campItemWise) || campItemWise.trim().length() == 0 )
{
if(comMap.containsKey(woItemCode))
{
utranid= comMap.get(woItemCode);
}
else
{ utranid = generateTranId("w_wocampaign", loginSite, conn);
......@@ -425,6 +450,7 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
comMap.put(woItemCode, utranid);
System.out.println("comMap[["+comMap+"]]");
}
}
//end by chandrashekar on on 09-oct-14
/*if(utranid.trim().length() <= 0)
......
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