Skip to content

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

modified at urse 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@37043 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 378f8ffd
Hide whitespace changes
Inline Side-by-side
Showing with 531 additions and 295 deletions
webitm-mfg/ibase/webitm/ejb/mfg/MrpWizPrsSaveBean.java
View file @ ef3036af
......@@ -88,7 +88,8 @@ public class MrpWizPrsSaveBean
StockAllocationPrc stockAllocationPrc = new StockAllocationPrc() ;
ArrayList itemValueList = new ArrayList();
ArrayList<String> detail4DataInfoList = new ArrayList<String>();
try
{
conn = connDriver.getConnectDB("DriverITM");
......@@ -308,6 +309,20 @@ public class MrpWizPrsSaveBean
System.out.println("@@@@ctr["+dtlCtr+"]saleOrder["+saleOrder+"]-lineNo["+lineNo+"]-qtyReqd["+qtyReqdStr+"]prevItemWorder["+prevItemWorder+"]previousItem["+previousItem+"]@@@");
System.out.println("@@@@ctr["+dtlCtr+"]siteCode["+siteCode+"]-itemCode["+itemCode+"]-lotNo["+lotNo+"]-lotSl["+lotSl+"]-locCode["+locCode+"]-tranSer["+tranSer+"]allocQtyStr["+allocQtyStr+"]@@@");
String detail4DataInfo = checkNull(siteCode)+"@"+checkNull(itemCode)+"@"+checkNull(locCode)+"@"+checkNull(lotNo)+"@"+checkNull(lotSl)+"@"+checkNull(qtyReqdStr);
System.out.println("@@@@ detail4DataInfo["+detail4DataInfo+"]detail4DataInfoList["+detail4DataInfoList+"]");
if(detail4DataInfoList.contains(detail4DataInfo))
{
System.out.println("same allocation repeate.........continue.......");
continue;
}
else
{
System.out.println("new allocation ................");
detail4DataInfoList.add(detail4DataInfo);
}
System.out.println("@@@@@@@@ testing purpose SOP....detail4DataInfoList["+detail4DataInfoList+"].");
String itemCodeHdr="";
remarks = "From mrp process";
......@@ -345,9 +360,10 @@ public class MrpWizPrsSaveBean
}
System.out.println("@@@@@::: sorder ["+tempSO+"]tempLineNo["+tempLineNo+"] updated next i["+i+"]....");
}
if( tempSO != null && tempSO.trim().length() > 0 )
if( tempSO != null && tempSO.trim().length() > 0 && tempLineNo != null && tempLineNo.trim().length() > 0 )
{
sql1=" select work_order from workorder where sale_order = ? AND site_code = ? ";
System.out.println("@@@@@::test: sorder ["+tempSO+"]tempLineNo["+tempLineNo+"]");
/*sql1=" select work_order from workorder where sale_order = ? AND site_code = ? ";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1,tempSO);
pstmt1.setString(2,siteCode);
......@@ -378,9 +394,82 @@ public class MrpWizPrsSaveBean
pstmt1=null;
System.out.println("@@@@@ 2 refWorkOrder ["+refWorkOrder+"]");
}*/
int SOCnt=0,MPSCnt=0;
sql1=" select count(1) from sorder where sale_order = ? ";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1,tempSO);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
SOCnt = rs1.getInt(1);
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
System.out.println("@@@@@398:tempSO["+tempSO+"]SOCnt["+SOCnt+"]");
if( SOCnt == 0 )
{
sql1=" select count(1) from MPS_ORDER where tran_id = ? ";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1,tempSO);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
MPSCnt = rs1.getInt(1);
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
}
System.out.println("@@@@@413:tempSO["+tempSO+"]SOCnt["+SOCnt+"]MPSCnt["+MPSCnt+"]");
if( SOCnt > 0)
{
sql1=" select work_order from workorder " +
" where TRAN_ID__MPS in " +
" ( select tran_id from MPS_ORDER where sale_order = ? and trim(line_no) = ? ) " +
" order by TRAN_ID__MPS desc ";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1,tempSO);
pstmt1.setString(2,tempLineNo);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
refWorkOrder = rs1.getString("work_order");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
System.out.println("@@@@@ 1 refWorkOrder from sorder["+tempSO+"] to mps to WO["+refWorkOrder+"]");
}
if( MPSCnt > 0 && ( refWorkOrder == null || refWorkOrder.trim().length() == 0 ) )
{
sql1=" select work_order from workorder " +
" where TRAN_ID__MPS in " +
" ( select tran_id from MPS_ORDER where sale_order = ? and trim(line_no) = ? )" +
" order by TRAN_ID__MPS desc ";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1,tempSO);
pstmt1.setString(2,tempLineNo);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
refWorkOrder = rs1.getString("work_order");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
//System.out.println("@@@@@ 2 refWorkOrder ["+refWorkOrder+"]");
System.out.println("@@@@@ 1 refWorkOrder from MPS["+tempSO+"] to WO["+refWorkOrder+"]");
}
}
System.out.println("@@@@@ final refWorkOrder ["+refWorkOrder+"]");
// modify for ref_no end on urse 10/10/15
......@@ -420,7 +509,7 @@ public class MrpWizPrsSaveBean
if (errString != null && errString.trim().length() > 0)
{
System.out.println("@@@@@@rolledback errString :::"+ errString );
System.out.println("@@@@@@rolledback stockAllocationPrc.updateInvallocTrace errString :::"+ errString );
conn.rollback();
return errString;
}
......@@ -508,7 +597,7 @@ public class MrpWizPrsSaveBean
hashMap.put("chg_user",chgUser);
hashMap.put("chg_term",chgTerm);
hashMap.put("chg_date", date );
System.out.println("CALLING updateInvallocTrace() --");
System.out.println("CALLING updateInvallocTrace() -hashMap["+hashMap+"]");
invAllocTrace = new InvAllocTraceBean();
errString = invAllocTrace.updateInvallocTrace(hashMap, conn);
System.out.println("updateInvallocTrace 1....."+errString);
......@@ -526,7 +615,7 @@ public class MrpWizPrsSaveBean
}
}
if(( errString == null || errString.trim().length() == 0 ) && sorderList != null && (itemCodeHdr.equalsIgnoreCase(itemCode)))
{
System.out.println("@@@@@@@@@@@ sorderList["+sorderList+"]itemCodeHdr["+itemCodeHdr+"]itemCode["+itemCode+"]allocQty["+allocQty+"]");
......@@ -534,32 +623,32 @@ public class MrpWizPrsSaveBean
System.out.println("@@@@@ sorderArray.length["+sorderArray.length+"]");
//for(int i=0;i<sorderArray.length;i++)
//{
//String tempSO="",tempLineNo="";
//tempSO=sorderArray[i];
//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 dtlCtr["+dtlCtr+"]....");
// update qty_alloc in sorditem after finish click in ATP @urse on 12/10/15
sql2 = " update sorditem set qty_alloc= qty_alloc + ? where sale_order = ? and ltrim(rtrim(line_no)) = ? ";
System.out.println("sql2 :"+sql2 );
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setDouble(1,allocQty);
pstmt2.setString(2,tempSO);
pstmt2.setString(3,tempLineNo);
int cnt4 = pstmt2.executeUpdate();
pstmt2.close();
pstmt2 = null;
System.out.println("@@@@@ sorditem qty_alloc::["+allocQty+"]::cnt4["+cnt4+"]");
//String tempSO="",tempLineNo="";
//tempSO=sorderArray[i];
//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 dtlCtr["+dtlCtr+"]....");
// update qty_alloc in sorditem after finish click in ATP @urse on 12/10/15
sql2 = " update sorditem set qty_alloc= qty_alloc + ? where sale_order = ? and ltrim(rtrim(line_no)) = ? ";
System.out.println("sql2 :"+sql2 );
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setDouble(1,allocQty);
pstmt2.setString(2,tempSO);
pstmt2.setString(3,tempLineNo);
int cnt4 = pstmt2.executeUpdate();
pstmt2.close();
pstmt2 = null;
System.out.println("@@@@@ sorditem qty_alloc::["+allocQty+"]::cnt4["+cnt4+"]");
//}
}
/*
if ( errString == null || errString.trim().length() == 0 )
{
......@@ -772,9 +861,9 @@ public class MrpWizPrsSaveBean
*/
}
// for sorder updation
......@@ -874,6 +963,15 @@ public class MrpWizPrsSaveBean
return "";
}
private String checkNull(String input)
{
if(input == null)
{
input = "";
}
return input;
}
private String generateTranId( String windowName, String siteCode, Connection conn )throws ITMException
{
PreparedStatement pstmt = null;
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ ef3036af
......@@ -18,45 +18,72 @@ package ibase.webitm.ejb.mfg;
6. in of case mfgtype = "O" create workorder instead of mps order
*/
import org.w3c.dom.*;
import java.rmi.RemoteException;
import java.util.*;
import java.util.Map.Entry;
import java.sql.*;
import java.io.*;
import java.text.SimpleDateFormat;
import java.text.NumberFormat;
import java.text.DecimalFormat;
import javax.ejb.*;
import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.*;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.mfg.adv.WorkorderPrc;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator;
import ibase.system.config.*;
import ibase.utility.CommonConstants;
import javax.ejb.Stateless; // added for ejb3
//12/04/10 manoharan MF90BHU003
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.rmi.RemoteException;
import java.sql.BatchUpdateException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Timestamp;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
import javax.ejb.Stateless;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFDataFormat;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.hssf.usermodel.HSSFFont;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
// added for ejb3
//12/04/10 manoharan MF90BHU003
//import org.apache.poi.xssf.usermodel.*;
//import org.apache.poi.ss.util.CellRangeAddress;
//import org.apache.poi.ss.usermodel.*;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
import org.w3c.dom.*;
import com.ibm.db2.jcc.a.m;
import javax.xml.parsers.*;
//end 12/04/10 manoharan MF90BHU003
......@@ -221,11 +248,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String yield="";
String soItemList="";
String roundingRequired="";
int bomLevel=0;
String[] arrStr = null;
int bomLevel=0;
String[] arrStr = null;
String xtraParams="";
public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException
{
System.out.println("Called process(string, string).....");
System.out.println("Called process(string, string).....xtraParams["+xtraParams+"]");
String resultString = null;
Document dom = null, dom1 = null;
String retString = null;
......@@ -291,8 +320,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
this.wnName=windowName;
long endTime = 0, totalTime = 0, totalHrs = 0, totlMts = 0, totSecs = 0; // Added
if( this.xtraParams == null || this.xtraParams.trim().length() == 0 )
{
System.out.println("before this.xtraParams ["+ this.xtraParams +"]");
this.xtraParams = xtraParams;
System.out.println("after this.xtraParams ["+ this.xtraParams +"]");
}
System.out.println("win name is ==>"+wnName);
System.out.println("win name["+wnName+"]xtraParams["+xtraParams+"] this.xtraParams ["+ this.xtraParams +"]");
// System.out.println("Initial Size of Item Has Map :" +
......@@ -339,8 +374,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
siteItemList = genericUtility.getColumnValue("site_item_list", dom); //added by chandrashekar
if(isRequirement)
{
siteItemQtyList = genericUtility.getColumnValue("site_item_qtylist", dom);
arrStr =siteItemQtyList.split(",");
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
......@@ -720,7 +755,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//adpElement.setDemand(dateFrom,bomReplaceDemand , " ", " " );
//270115 //adpeList.add(adpElement);
//cpatil-25/08/14-System.out.println("13/06/14 adpeList.size() after 1 [" + adpeList.size() + "] itemBomMap [" + itemBomMap + "]");
System.out.println(">>>>Before calling bomExplode at line 706 in getDate() bomCode1:"+bomCode1);
System.out.println(">>>>Before calling bomExplode at line 706 in getDate() bomCode1:"+bomCode1);
errString = bomExplode( siteCode1, bomCode1);
endTime = System.currentTimeMillis();
totalTime = endTime - startTime;
......@@ -1667,7 +1702,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
sql = sql + "AND A.SITE_CODE = ? ";
if(!"w_requirement".equalsIgnoreCase(wnName1))//added by priyanka shinde on 24/06/15 if objname is material requirement then no need to add master_sch condition in sql
{
sql = sql + "AND CASE WHEN A.MASTER_SCH IS NULL THEN 'Y' ELSE A.MASTER_SCH END <> 'N' ";
sql = sql + "AND CASE WHEN A.MASTER_SCH IS NULL THEN 'Y' ELSE A.MASTER_SCH END <> 'N' ";
}
//sql = sql + "AND B.VALID_UPTO IS NULL ";
sql = sql + "AND C.ITEM_SER >=? ";
......@@ -1685,7 +1720,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
sql = sql + "AND A.SITE_CODE = ? ";
if(!"w_requirement".equalsIgnoreCase(wnName1))
{
sql = sql + "AND CASE WHEN A.MASTER_SCH IS NULL THEN 'Y' ELSE A.MASTER_SCH END <> 'N' ";//added by priyanka shinde on 24/06/15 if objname is material requirement then no need to add master_sch condition in sql
sql = sql + "AND CASE WHEN A.MASTER_SCH IS NULL THEN 'Y' ELSE A.MASTER_SCH END <> 'N' ";//added by priyanka shinde on 24/06/15 if objname is material requirement then no need to add master_sch condition in sql
}
//sql = sql + "AND B.VALID_UPTO IS NULL ";
sql = sql + "AND C.ITEM_SER >= ? ";
......@@ -1874,7 +1909,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String bomItem="";
try
{
System.out.println(">>>>>>>>>In bomExplode bomCode:"+bomCode);
System.out.println(">>>>>>>>>In bomExplode bomCode:"+bomCode);
// 19-01-2007 manoharan
// check whether the bom is valid should be confirmed and active
pstmtValidBom = conn.prepareStatement(sqlValidBom);
......@@ -2043,12 +2078,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(bomLevel > 0)//condition added by sagar on 29/05/15
{
if(level > bomLevel )
{
System.out.println(">>>>>>>>level is greater than bomLevel:"+level);
break;
}
{
System.out.println(">>>>>>>>level is greater than bomLevel:"+level);
break;
}
}
// System.out.println("Item Code : "+rs.getString(1));
// 14/06/14 manoharan in case of changing bom_code itemCodeMap is not populated so populate the same
//if( isBomReplace )
......@@ -3726,111 +3761,111 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pendingIndentAdp = adpElement.getPendingIndent();
pendingDRAdp = adpElement.getPendingDR();
reorderLevel= adpElement.getReorderLevel();
System.out.println("@@@_ctr1["+ctr1+"]saleOrderAdp==["+saleOrderAdp+"]itemCodeAdp==["+itemCodeAdp+"]siteCodeAdp["+siteCodeAdp+"]demandAdp["+demandAdp+"]supplyAdp["+supplyAdp+"]stockQtyAdp["+stockQtyAdp+"]othSupplyAdp["+othSupplyAdp+"]pendingPOAdp["+pendingPOAdp+"]pendingDOAdp["+pendingDOAdp+"]pendingIndentAdp["+pendingIndentAdp+"]pendingDRAdp["+pendingDRAdp+"]reorderLevel["+reorderLevel+"]");
if(isDetailReq)
{
System.out.println("@@@@@010415:::itemCodeAdp["+itemCodeAdp+"]demandAdp["+demandAdp+"]-supplyAdp["+supplyAdp+"]+reorderLevel["+reorderLevel+"]");
/*if((demandAdp - supplyAdp) < reorderLevel )
System.out.println("@@@@@010415:::itemCodeAdp["+itemCodeAdp+"]demandAdp["+demandAdp+"]-supplyAdp["+supplyAdp+"]+reorderLevel["+reorderLevel+"]");
/*if((demandAdp - supplyAdp) < reorderLevel )
{
adpElement.setDemand(demandAdp-supplyAdp+reorderLevel);
}*/
if(reorderLevel>0)
{
if( supplyAdp == 0 && checkNull(saleOrderAdp).trim().length() > 0 )
if(reorderLevel>0)
{
if( supplyAdp == 0 && checkNull(saleOrderAdp).trim().length() > 0 )
{
//demandAdp = demandAdp + reorderLevel ;
demandAdp = reorderLevel ;
adpElement.setDemand(demandAdp);
boolean mrpFlag = false;
ArrayList <TimeMRP>timemrpList=adpElement.getTimeMrpList();
ArrayList <TimeMRP>timemrpListN=new ArrayList<TimeMRP>();
if(timemrpList.size()>0)
{
//demandAdp = demandAdp + reorderLevel ;
demandAdp = reorderLevel ;
adpElement.setDemand(demandAdp);
boolean mrpFlag = false;
ArrayList <TimeMRP>timemrpList=adpElement.getTimeMrpList();
ArrayList <TimeMRP>timemrpListN=new ArrayList<TimeMRP>();
if(timemrpList.size()>0)
{
for(int k=0;k<timemrpList.size();k++)
{
TimeMRP tmp=timemrpList.get(k);
if( tmp.getDemand() > 0 && mrpFlag == false )
{
System.out.println("@@@@@010415:::itemCodeAdp["+itemCodeAdp+"] tmp.getDemand()["+tmp.getDemand()+"]-tmp.getSupply()["+tmp.getSupply()+"]+reorderLevel["+reorderLevel+"]");
tmp.setDemand( demandAdp ) ;
System.out.println("@@@@@010415:::tmp.getDemand()["+tmp.getDemand()+"]");
//tmp.setRunningDemand(reorderLevel);
tmp.setRunningDemand( demandAdp );
System.out.println("@@@@@010415:::tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
mrpFlag = true;
}
timemrpListN.add(tmp);
}
adpElement.SetTimeMRPArr(timemrpListN);
}
}
if( supplyAdp > 0)
{
double netReqd=0,planSupply=0;
netReqd=adpElement.getDemand()-adpElement.getSupply();
planSupply=adpElement.getDemand()-adpElement.getSupply()+reorderLevel;
System.out.println("netReqd["+netReqd+"]");
System.out.println("before deduction planSupply["+planSupply+"]");
if(netReqd>0)
for(int k=0;k<timemrpList.size();k++)
{
TimeMRP tmp=timemrpList.get(k);
if( tmp.getDemand() > 0 && mrpFlag == false )
{
planSupply=planSupply-netReqd;
System.out.println("@@@@@010415:::itemCodeAdp["+itemCodeAdp+"] tmp.getDemand()["+tmp.getDemand()+"]-tmp.getSupply()["+tmp.getSupply()+"]+reorderLevel["+reorderLevel+"]");
tmp.setDemand( demandAdp ) ;
System.out.println("@@@@@010415:::tmp.getDemand()["+tmp.getDemand()+"]");
//tmp.setRunningDemand(reorderLevel);
tmp.setRunningDemand( demandAdp );
System.out.println("@@@@@010415:::tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
mrpFlag = true;
}
else // added for wrong mps quantity changes
timemrpListN.add(tmp);
}
adpElement.SetTimeMRPArr(timemrpListN);
}
}
if( supplyAdp > 0)
{
double netReqd=0,planSupply=0;
netReqd=adpElement.getDemand()-adpElement.getSupply();
planSupply=adpElement.getDemand()-adpElement.getSupply()+reorderLevel;
System.out.println("netReqd["+netReqd+"]");
System.out.println("before deduction planSupply["+planSupply+"]");
if(netReqd>0)
{
planSupply=planSupply-netReqd;
}
else // added for wrong mps quantity changes
{
planSupply=reorderLevel+netReqd;
}
System.out.println("after deduction planSupply["+planSupply+"]");
if( planSupply > 0 ) // added for removing negetive gross wt
{
boolean mrpFlag = false;
ArrayList <TimeMRP>timemrpList=adpElement.getTimeMrpList();
ArrayList <TimeMRP>timemrpListN=new ArrayList<TimeMRP>();
if(timemrpList.size()>0)
{
for(int k=0;k<timemrpList.size();k++)
{
planSupply=reorderLevel+netReqd;
TimeMRP tmp=timemrpList.get(k);
System.out.println("3685--tmp.getDemand()["+tmp.getDemand()+"]tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
if( tmp.getSupply() > 0 && mrpFlag == false )
{
System.out.println("@@@@@010415:::itemCodeAdp["+itemCodeAdp+"] tmp.getDemand()["+tmp.getDemand()+"]-tmp.getSupply()["+tmp.getSupply()+"]+reorderLevel["+reorderLevel+"]");
tmp.setDemand(planSupply ) ;
System.out.println("@@@@@010415:::tmp.getDemand()["+tmp.getDemand()+"]");
//tmp.setRunningDemand(reorderLevel);
tmp.setRunningDemand(adpElement.getDemand()+planSupply );
System.out.println("@@@@@010415:::tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
System.out.println("3694--tmp.getDemand()["+tmp.getDemand()+"]tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
System.out.println("3695---adpElement.getDemand()["+adpElement.getDemand()+"]");
adpElement.setDemand(adpElement.getDemand()+planSupply);
mrpFlag = true;
}
timemrpListN.add(tmp);
}
System.out.println("after deduction planSupply["+planSupply+"]");
if( planSupply > 0 ) // added for removing negetive gross wt
{
boolean mrpFlag = false;
ArrayList <TimeMRP>timemrpList=adpElement.getTimeMrpList();
ArrayList <TimeMRP>timemrpListN=new ArrayList<TimeMRP>();
if(timemrpList.size()>0)
{
for(int k=0;k<timemrpList.size();k++)
{
TimeMRP tmp=timemrpList.get(k);
System.out.println("3685--tmp.getDemand()["+tmp.getDemand()+"]tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
if( tmp.getSupply() > 0 && mrpFlag == false )
{
System.out.println("@@@@@010415:::itemCodeAdp["+itemCodeAdp+"] tmp.getDemand()["+tmp.getDemand()+"]-tmp.getSupply()["+tmp.getSupply()+"]+reorderLevel["+reorderLevel+"]");
tmp.setDemand(planSupply ) ;
System.out.println("@@@@@010415:::tmp.getDemand()["+tmp.getDemand()+"]");
//tmp.setRunningDemand(reorderLevel);
tmp.setRunningDemand(adpElement.getDemand()+planSupply );
System.out.println("@@@@@010415:::tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
System.out.println("3694--tmp.getDemand()["+tmp.getDemand()+"]tmp.getRunningDemand()["+tmp.getRunningDemand()+"]");
System.out.println("3695---adpElement.getDemand()["+adpElement.getDemand()+"]");
adpElement.setDemand(adpElement.getDemand()+planSupply);
mrpFlag = true;
}
timemrpListN.add(tmp);
}
adpElement.SetTimeMRPArr(timemrpListN);
}
//adpElement.setDemand(dueDate,planSupply, adpElement.getSaleOrder(),adpElement.getLineNo());
adpElement.setReordPlanQty(planSupply);
} // end if for gross weight negeative
}
}
ArrayList<HashMap<String, ADPElement>> detList=adpElement.getDetList();
adpElement.SetTimeMRPArr(timemrpListN);
}
//adpElement.setDemand(dueDate,planSupply, adpElement.getSaleOrder(),adpElement.getLineNo());
adpElement.setReordPlanQty(planSupply);
} // end if for gross weight negeative
}
}
ArrayList<HashMap<String, ADPElement>> detList=adpElement.getDetList();
for(int l=0;l<detList.size();l++)
{
HashMap<String,ADPElement> detMap=detList.get(l);
......@@ -4085,7 +4120,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
dueDate = rs.getTimestamp(2);
if(!isRequirement)//Added by chandrashekar on 15-07-2015
{
demand = rs.getDouble(3);
demand = rs.getDouble(3);
}
supply = rs.getDouble(4);
// 12/04/10 manoharan MF90BHU001 stock and other supply to be
......@@ -4104,42 +4139,42 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{
qtStk = rs.getDouble(12);
holdQuantity = rs.getDouble(13);
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 )
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)
{
revisedQtyStr=tempItemLstArr[1];
if (revisedQtyStr != null && revisedQtyStr.trim().length() > 0)
try
{
try
{
revisedQty = Double.parseDouble(revisedQtyStr);
} catch (NumberFormatException n)
{
revisedQty = 0;
}
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;
supply = 0;
System.out.println("final demand>>>>"+revisedQty);
break;
}
}
System.out.println("siteItemMatchValue>>>>>>"+siteItemMatchValue);
System.out.println("SiteItemComb>>>>>>"+SiteItemComb);
if(siteItemMatchValue.equalsIgnoreCase(SiteItemComb))
{
demand = revisedQty;
supply = 0;
System.out.println("final demand>>>>"+revisedQty);
break;
}
}
}
//cpatil-25/08/14-System.out.println("isDetailReq3------"+isDetailReq);
if(isDetailReq)
......@@ -4192,7 +4227,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{
adpElement.setQtStk(qtStk);
adpElement.setHoldQuantity(holdQuantity);
}
if(isDetailReq)
{
......@@ -4654,12 +4689,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//adpElement.setDemand(dueDate, demand, " ", " ");
//adpElement.setDemand(dueDate, demand, " ", " ");
//adpElement.setSupply(dueDate, supply);
reorderLevel=adpElement.getReorderLevel();
/*if(reorderLevel>0)
{
netReqd=adpElement.getDemand()-dataBeanTemp.getSupply();
planSupply=adpElement.getDemand()-dataBeanTemp.getSupply()+reorderLevel;
System.out.println("netReqd["+netReqd+"]");
......@@ -4673,7 +4708,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
adpElement.setDemand(dueDate,planSupply, adpElement.getSaleOrder(),adpElement.getLineNo());
adpElement.setReordPlanQty(planSupply);
}*/
adpElement.setSupply(dueDate, (Double) dataBeanTemp.getSupply());
//adpElement.setStockQty(dueDate, stockQty);
adpElement.setStockQty(dueDate, (Double) dataBeanTemp.getStockQty());
......@@ -4754,7 +4789,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
for(int i=0;i<altItemlist.size();i++)
{
String altItem[]=altItemlist.get(i).split("@");
System.out.println("Alternate Item["+altItem[0]+"]");
System.out.println("Alternate Item["+altItem[0]+"]4444altItem[1]["+altItem[1]+"]");
adpElement.getDetList().add(getAltItemSupply(adpElement.getSiteCode(),altItem[0],altItem[1]));
}
}
......@@ -5388,8 +5423,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String tmpSO=checkNull(adpElement.getSaleOrder());
if(tmpSO.trim().length()==0)
{
// adpeList.remove(adpeList.indexOf(adpElement));
// adpeList.remove(adpeList.indexOf(adpElement));
if( adpeList.indexOf(adpElement) > -1) // add this condition at urse on 11/10/15 for remove exception
{
adpeList.remove(adpeList.indexOf(adpElement));
......@@ -5397,7 +5432,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
}
}
/*//start Added by chandrashekar on 09-07-2014
......@@ -5468,7 +5503,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
* adpeList.remove(ctr); } // end 01/04/11
*/
int ctr = indexOfADPElement(siteCode, rsItemCode, saleOrder, lineNo);
System.out.println("01/04/11---BHU saleOrder [" + saleOrder + "]rsItemCode["+rsItemCode+"] itemCode["+itemCode+"]lineNo [" + lineNo + "] ctr [" + ctr + "] [--"+rsItemCode+"]");
......@@ -5703,7 +5738,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double batchSizeLead = 0;
// end 22/06/10 manoharan
double reorderLevel=0;
ExplodeBom explodeBomObj = new ExplodeBom();
demand = adpElement.getDemand();
......@@ -6412,7 +6447,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
orderOpt = adpElement.getOrderOpt();
minStkDay = adpElement.getMinStkDay();
reorderLevel=adpElement.getReorderLevel();
System.out.println("25022010 Item " + adpElement.getItemCode() + " integralQty " + decFormat(integralQty) + " req qty " + decFormat(reqQty) + " Batch Qty " + decFormat(batchQty)+"reorderLevel["+reorderLevel+"]");
if (minStkDay > 0 && mrpDynMinStk.equals("Y"))
{
......@@ -6425,7 +6460,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
else
{*/
stkLevel = adpElement.getMinQty();
stkLevel = adpElement.getMinQty();
//}
if (minOrderChk.equals("Y"))
{
......@@ -7354,7 +7389,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
conn = connDriver.getConnectDB("DriverITM");
}
sqlIndent = "DELETE FROM INDENT " + "WHERE SITE_CODE = ? " + "AND ITEM_CODE IN (" + "SELECT CASE WHEN ITEM_CODE__PLAN IS NULL THEN ITEM_CODE ELSE ITEM_CODE__PLAN END " + "FROM ITEM " + "WHERE ITEM_CODE = ? ) " + "AND STATUS = 'U' " + "AND IND_TYPE = 'M' ";
sqlIndent = " DELETE FROM INDENT " + "WHERE SITE_CODE = ? " + "AND ITEM_CODE IN (" + "SELECT CASE WHEN ITEM_CODE__PLAN IS NULL THEN ITEM_CODE ELSE ITEM_CODE__PLAN END " + "FROM ITEM " + "WHERE ITEM_CODE = ? ) " + "AND STATUS = 'U' " + "AND IND_TYPE = 'M' ";
sqlMpsOrder = "DELETE FROM MPS_ORDER " + "WHERE SITE_CODE = ? " + "AND ITEM_CODE = ? "+ " AND STATUS in ('M')";//Manoj dtd 14/07/2014 Status Changed from N to M
......@@ -8180,7 +8215,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
else
{
System.out.println("8008---soItemListMap.size["+soItemListMap.size()+"]");
if( soItemListMap.size() > 0 )
{
if(soItemListMap.containsKey(itemCode.trim()))
......@@ -8189,7 +8224,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//System.out.println("@@@@@@@@@ mpsOrder.addnOrder["+mpsOrder.addnOrder+"]");
}
}
}
System.out.println("@@@@@@@@@itemCode 3 ["+itemCode+"] tempSORef["+tempSORef+"]");
......@@ -8727,6 +8762,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double noArt=0,netWeight=0;
String feedbackReqd="";
boolean insertFlag = true; // added by cpatil for new req
ArrayList<String> tranIdList = new ArrayList<String>();
try
{
System.out.println("@@@@@@@@@cpatil:InsertPlanDemand called----winName["+winName+"] list["+list+"]--------");
......@@ -8853,7 +8891,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// added by sabyasachi 30-03-11
saleOrder = mpsOrder.saleOrder;
lineNo = mpsOrder.lineNo;
System.out.println("@@@@@@@8894:::saleOrder["+saleOrder+"]lineNo["+lineNo+"]");
if( "".equalsIgnoreCase(projCode) || ( projCode != null && projCode.trim().length() == 0 )) //FK_WORKORDER_PROJ added for exception
{
projCode = null;
......@@ -8896,11 +8934,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if ("O".equals(mpsOrder.mfgType))
{
pstmtWorkOrder = conn.prepareStatement(sqlWorkOrder);
noArt = 0 ;
netWeight = 0 ;
System.out.println("for workorder...itemCode["+itemCode+"]addnOrder["+addnOrder+"]");
System.out.println("for workorder...itemCode["+itemCode+"]addnOrder["+addnOrder+"]saleOrder["+saleOrder+"]");
System.out.println("for workorder...["+workOrder+"]bomCode["+bomCode+"]ordType["+ordType+"]");
workOrder = getUniqueKey(xmlValues, mpsKeyStr, "work_order", "W-ORD");
pstmtWorkOrder.setString(1, workOrder);
......@@ -8985,7 +9023,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{
pstmtWorkOrder.setString(33,"");
}
pstmtWorkOrder.setDouble(34, 0);
if("Y".equalsIgnoreCase(feedbackReqd))
......@@ -8997,91 +9035,134 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pstmtWorkOrder.setString(35,""); // added for feedback req 'Y' on 23/09/15 by cpatil
}// end
// pstmtWorkOrder.addBatch(); //
// pstmtWorkOrder.addBatch(); //
int rcnt = pstmtWorkOrder.executeUpdate();
System.out.println("@@@ rcnt["+rcnt+"]");
pstmtWorkOrder.close();
pstmtWorkOrder = null;
System.out.println("@@@ rcnt["+rcnt+"]");
pstmtWorkOrder.close();
pstmtWorkOrder = null;
WOtranId = workOrder;
} else
{
System.out.println("for MpsOrder...itemCode["+itemCode+"]addnOrder["+addnOrder+"]");
tranIdMpsOrder = getUniqueKey(xmlValues, mpsKeyStr, "tran_id", "W-MPS");
pstmtMpsOrder.setString(1, tranIdMpsOrder);
pstmtMpsOrder.setString(2, ordType);
pstmtMpsOrder.setString(3, itemCode);
pstmtMpsOrder.setString(4, siteCode);
pstmtMpsOrder.setDouble(5, quantity);
pstmtMpsOrder.setTimestamp(6, ordDate);
pstmtMpsOrder.setTimestamp(7, planDueDate);
pstmtMpsOrder.setString(8, mrpRunId);
pstmtMpsOrder.setString(9, addnOrder);
pstmtMpsOrder.setTimestamp(10, dueDate);
pstmtMpsOrder.setString(11, "M");//Manoj dtd 14/07/2014 Status Changed from P to M
pstmtMpsOrder.setTimestamp(12, statusDate);
pstmtMpsOrder.setDouble(13, yieldPerc);
pstmtMpsOrder.setString(14, routeCode);
pstmtMpsOrder.setString(15, bomCode);
pstmtMpsOrder.setString(16, projCode);
pstmtMpsOrder.setTimestamp(17, chgDate);
pstmtMpsOrder.setString(18, chgUser);
pstmtMpsOrder.setString(19, chgTerm);
pstmtMpsOrder.setString(20, unit);
pstmtMpsOrder.setString(21, acctCodeWp);
pstmtMpsOrder.setString(22, cctrCodeWp);
pstmtMpsOrder.setDouble(23, quantity);
pstmtMpsOrder.setString(24, unit);
pstmtMpsOrder.setDouble(25, quantity);
pstmtMpsOrder.setDouble(26, 1);
if (saleOrder != null && saleOrder.trim().length() > 0)
{
pstmtMpsOrder.setString(27, saleOrder);
} else
{
pstmtMpsOrder.setNull(27, java.sql.Types.CHAR);
}
if (lineNo != null && lineNo.trim().length() > 0)
{
pstmtMpsOrder.setString(28, lineNo);
} else
System.out.println("for MpsOrder...itemCode["+itemCode+"]addnOrder["+addnOrder+"]mpsOrder.mfgType["+mpsOrder.mfgType+"]orderType["+orderType+"]");
/*
if( isDetailReq ) // added on 14/10/15 @supreme
{
pstmtMpsOrder.setNull(28, java.sql.Types.CHAR);
if( "MPS".equals(orderType) && "S".equalsIgnoreCase(mpsOrder.mfgType))
{
insertFlag = false;
System.out.println("@@@@@ insertFlag["+insertFlag+"]");
}
}
*/
// if(insertFlag)
// {
tranIdMpsOrder = getUniqueKey(xmlValues, mpsKeyStr, "tran_id", "W-MPS");
pstmtMpsOrder.setString(1, tranIdMpsOrder);
pstmtMpsOrder.setString(2, ordType);
pstmtMpsOrder.setString(3, itemCode);
pstmtMpsOrder.setString(4, siteCode);
pstmtMpsOrder.setDouble(5, quantity);
pstmtMpsOrder.setTimestamp(6, ordDate);
pstmtMpsOrder.setTimestamp(7, planDueDate);
pstmtMpsOrder.setString(8, mrpRunId);
pstmtMpsOrder.setString(9, addnOrder);
pstmtMpsOrder.setTimestamp(10, dueDate);
pstmtMpsOrder.setString(11, "M");//Manoj dtd 14/07/2014 Status Changed from P to M
pstmtMpsOrder.setTimestamp(12, statusDate);
pstmtMpsOrder.setDouble(13, yieldPerc);
pstmtMpsOrder.setString(14, routeCode);
pstmtMpsOrder.setString(15, bomCode);
pstmtMpsOrder.setString(16, projCode);
pstmtMpsOrder.setTimestamp(17, chgDate);
pstmtMpsOrder.setString(18, chgUser);
pstmtMpsOrder.setString(19, chgTerm);
pstmtMpsOrder.setString(20, unit);
pstmtMpsOrder.setString(21, acctCodeWp);
pstmtMpsOrder.setString(22, cctrCodeWp);
pstmtMpsOrder.setDouble(23, quantity);
pstmtMpsOrder.setString(24, unit);
pstmtMpsOrder.setDouble(25, quantity);
pstmtMpsOrder.setDouble(26, 1);
if (saleOrder != null && saleOrder.trim().length() > 0)
{
pstmtMpsOrder.setString(27, saleOrder);
} else
{
pstmtMpsOrder.setNull(27, java.sql.Types.CHAR);
}
if (lineNo != null && lineNo.trim().length() > 0)
{
pstmtMpsOrder.setString(28, lineNo);
} else
{
pstmtMpsOrder.setNull(28, java.sql.Types.CHAR);
}
if( isDetailReq ) // added for supreme loc_group on 28/09/15
{
System.out.println("@@@@@final---locGroupMap["+locGroupMap+"]]");
String tempLocGroup="";
Set s1=locGroupMap.entrySet();
Iterator itr=s1.iterator();
while(itr.hasNext())
{
Map.Entry m=(Map.Entry)itr.next();
if( isDetailReq ) // added for supreme loc_group on 28/09/15
{
System.out.println("@@@@@final---locGroupMap["+locGroupMap+"]]");
String tempLocGroup="";
Set s1=locGroupMap.entrySet();
Iterator itr=s1.iterator();
while(itr.hasNext())
{
String keyListStr = m.getKey().toString();
tempLocGroup = locGroupMap.get(keyListStr).toString();
break;
Map.Entry m=(Map.Entry)itr.next();
{
String keyListStr = m.getKey().toString();
tempLocGroup = locGroupMap.get(keyListStr).toString();
break;
}
}
pstmtMpsOrder.setString(29,tempLocGroup);
}
pstmtMpsOrder.setString(29,tempLocGroup);
}
else
{
pstmtMpsOrder.setString(29,"");
}
else
{
pstmtMpsOrder.setString(29,"");
}
// **************pstmtMpsOrder.setDouble(25, demandQty);
pstmtMpsOrder.addBatch();
WOtranId = tranIdMpsOrder;
if( isDetailReq && tranIdMpsOrder!= null && tranIdMpsOrder.trim().length() > 0 && "S".equalsIgnoreCase(mpsOrder.mfgType))
{
System.out.println("tranIdMpsOrder["+tranIdMpsOrder+"]");
tranIdList.add(tranIdMpsOrder);
System.out.println("tranIdList["+tranIdList+"]");
}
// }// end of insert flag
// else
// {
// System.out.println("@@@@@@@@@@:9140::saleOrder["+saleOrder+"]");
// if( saleOrder != null && saleOrder.trim().length() > 0 )
// {
// tranIdList.add(saleOrder);
// }
// }
/*if( isDetailReq ) // add for mpsToWorkOrder on 14/10/15 @urse by cpatil
{
String xtraParams="", windowName="mps_to_wo";
WorkorderPrc mpsToWorkOrder = new WorkorderPrc();
//errString = mpsToWorkOrder.process(xmlValues, xmlValues, windowName, xtraParams);
System.out.println("@@@@@@ tranIdList["+tranIdList+"]");
errString = mpsToWorkOrder.calWorkorderPrc( tranIdList, conn);
System.out.println("@@@@@@ errString["+errString+"]");
}*/
// **************pstmtMpsOrder.setDouble(25, demandQty);
pstmtMpsOrder.addBatch();
WOtranId = tranIdMpsOrder;
}
// System.out.println("Inserting mpsorder # " + count +
// " : " + tranIdMpsOrder);
......@@ -9443,6 +9524,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// Commented by Jiten 31/10/06 - error -null pointer Exception
// pstmtMpsOrder.clearParameters();
pstmtMpsOrder.close();
// End
// conn.commit();
......@@ -9464,8 +9548,25 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// pstmtIndDemand.clearParameters();//Commented by Jiten 14/11/06 as
// giving null pointer exception
pstmtIndDemand.close();
if( isDetailReq ) // add for mpsToWorkOrder on 14/10/15 @urse by cpatil
{
//String windowName="mps_to_wo";
WorkorderPrc mpsToWorkOrder = new WorkorderPrc();
//errString = mpsToWorkOrder.process(xmlValues, xmlValues, windowName, xtraParams);
System.out.println("@@@@@@ tranIdList["+tranIdList+"]tranIdList.size()["+tranIdList.size()+"]xtraParams["+xtraParams+"]");
if( tranIdList.size() > 0)
{
//errString = mpsToWorkOrder.calWorkorderPrc( tranIdList, conn);
errString = mpsToWorkOrder.calWorkorderPrc( tranIdList, conn,xtraParams);
}
System.out.println("@@@@@@ errString["+errString+"]");
}
conn.commit();
// System.out.println("Rows Inserted in Work Order : [" + rowsInsertedWorkOrder.length + "]");
// System.out.println("Rows Inserted in Work Order : [" + rowsInsertedWorkOrder.length + "]");
System.out.println("Rows Inserted in Mps Order : [" + rowsInsertedMpsOrder.length + "]");
System.out.println("Rows Inserted in Indent : [" + rowsInsertedIndent.length + "]");
System.out.println("Rows Inserted in Dist Demand : [" + rowsInsertedDistDemand.length + "]");
......@@ -10289,7 +10390,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
/*if(isRequirement)
{
timeCtrLength= timeMRParr.size();
}
else
......@@ -11089,7 +11190,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
if(isRequirement)//Added by Chandrashekar on 11-08-14
{
valueXmlString = new StringBuffer();
//cpatil-25/08/14-System.out.println("context["+context+"]");
//reqValueXmlString = new StringBuffer("<?xml version = \"1.0\"?><Root>\r\n");
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPWiz.java
View file @ ef3036af
......@@ -539,7 +539,9 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
//" 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 )" +
" and (select count(1) from mps_order where mps_order.sale_order = sorder.sale_order and siteitem.mfg_type = 'S') = 0" ;
// " and (select count(1) from mps_order where mps_order.sale_order = sorder.sale_order and siteitem.mfg_type = 'S') = 0 " +
" and (select count(1) from mps_order where mps_order.sale_order = sorder.sale_order and " +
" sorder.sale_order = sorditem.sale_order and sorditem.alloc_flag='N' and siteitem.mfg_type = 'S' ) = 0 " ;
if("order_date".equalsIgnoreCase(viewByDate))
{
......
webitm-mfg/ibase/webitm/ejb/mfg/WoTransferPrc.java
View file @ ef3036af
......@@ -1443,7 +1443,8 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
" from inv_alloc_det where tran_id IN (SELECT TRAN_ID FROM INV_ALLOCATE "+
" WHERE WORK_ORDER IN (SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO = ? AND STATUS = 'R')) "+
" and loc_code in(select loc_code from location where inv_stat in("+invstat1Str+") ) and site_code = ? and item_code= ? " // change invstat1 to invstat1Str for multiple loc code on 22/09/15 by cpatil
+ "and case when deallocated is null then 'N' else deallocated end = 'N' and lot_no=? and lot_sl=? and loc_code=? ";
+ " and case when deallocated is null then 'N' else deallocated end = 'N' and lot_no=? and lot_sl=? and loc_code=? "
+ " and (case when alloc_qty is null then 0 else alloc_qty end) <> (case when dealloc_qty is null then 0 else dealloc_qty end) "; // add this condition to remove triger error for update dealloc quaantity repeat from stock @urse 19/10/15
pstmt = connOne.prepareStatement(sql);
pstmt.setString(1,campNo);
......@@ -1475,7 +1476,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
hashMap.put("chg_term", GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams, "termId"));
hashMap.put("loc_code__fr",rs.getString("loc_code"));
hashMap.put("exp_lev",rs.getString("exp_lev"));
System.out.println("Calling DistStkUpdEJB....."+ddlg);
System.out.println("Calling DistStkUpdEJB.....["+ddlg+"]hashMap["+hashMap+"]");
if (distStkUpd.updAllocTrace(hashMap, connOne) > 0)
{
System.out.println("distStkUpd.UpdAllocTrace(HashMap, Connection) : Sucessuful!");
......
webitm-mfg/ibase/webitm/ejb/mfg/adv/WorkorderPrc.java
View file @ ef3036af
......@@ -475,12 +475,46 @@ public class WorkorderPrc extends ProcessEJB implements WorkorderPrcLocal,Worko
System.out.println("Error Message=>"+errString);
return errString;
}//END OF PROCESS(2)
public String calWorkorderPrc(ArrayList tranList,Connection conn) throws Exception,ITMException
{
String errString="", xtraParams="";
errString=calWorkorderPrc(tranList,conn,xtraParams);
System.out.println("calWorkorderPrc(tranList,conn,xtraParams)@@@errString["+errString+"]");
return errString;
}
private String calWorkorderPrc(ArrayList tranList,Connection conn) throws Exception,ITMException
public String calWorkorderPrc(ArrayList tranList,Connection conn, String xtraParams) throws Exception,ITMException
{
System.out.println("@@@@@@@@@@@ calWorkorderPrc()............");
ResultSet rs1 = null,rsSql1=null,rsSql2=null;
PreparedStatement pstmt = null,pstmtInsert=null,pstmtUpdate=null,pstmtSql1=null,pstmtSql2=null;
if( this.conn==null)
{
System.out.println("@@@@@@@@@ conn null found...........");
this.conn = conn;
System.out.println("@@@@@@@@@ existing conn assign this.conn..........");
}
if( this.loginCode == null )
{
this.loginCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
this.loginCode = blanknull(this.loginCode).trim();
}
if( this.chgTerm == null )
{
this.chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
this.chgTerm = blanknull(this.chgTerm).trim();
}
System.out.println("[WorkorderPrc][calWorkorderPrc][loginCode]=>["+loginCode+"]this.loginCode["+this.loginCode+"]");
System.out.println("[WorkorderPrc][calWorkorderPrc][chgTerm]=>["+chgTerm+"]this.chgTerm ["+this.chgTerm +"]");
int i=0;
double quantity=0.0;
double yieldPerc=0.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