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
Show 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,6 +88,7 @@ public class MrpWizPrsSaveBean ...@@ -88,6 +88,7 @@ public class MrpWizPrsSaveBean
StockAllocationPrc stockAllocationPrc = new StockAllocationPrc() ; StockAllocationPrc stockAllocationPrc = new StockAllocationPrc() ;
ArrayList itemValueList = new ArrayList(); ArrayList itemValueList = new ArrayList();
ArrayList<String> detail4DataInfoList = new ArrayList<String>();
try try
{ {
...@@ -308,6 +309,20 @@ public class MrpWizPrsSaveBean ...@@ -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+"]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+"]@@@"); 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=""; String itemCodeHdr="";
remarks = "From mrp process"; remarks = "From mrp process";
...@@ -345,9 +360,10 @@ public class MrpWizPrsSaveBean ...@@ -345,9 +360,10 @@ public class MrpWizPrsSaveBean
} }
System.out.println("@@@@@::: sorder ["+tempSO+"]tempLineNo["+tempLineNo+"] updated next i["+i+"]...."); 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=conn.prepareStatement(sql1);
pstmt1.setString(1,tempSO); pstmt1.setString(1,tempSO);
pstmt1.setString(2,siteCode); pstmt1.setString(2,siteCode);
...@@ -378,6 +394,79 @@ public class MrpWizPrsSaveBean ...@@ -378,6 +394,79 @@ public class MrpWizPrsSaveBean
pstmt1=null; pstmt1=null;
System.out.println("@@@@@ 2 refWorkOrder ["+refWorkOrder+"]"); 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+"]");
} }
} }
...@@ -420,7 +509,7 @@ public class MrpWizPrsSaveBean ...@@ -420,7 +509,7 @@ public class MrpWizPrsSaveBean
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
System.out.println("@@@@@@rolledback errString :::"+ errString ); System.out.println("@@@@@@rolledback stockAllocationPrc.updateInvallocTrace errString :::"+ errString );
conn.rollback(); conn.rollback();
return errString; return errString;
} }
...@@ -508,7 +597,7 @@ public class MrpWizPrsSaveBean ...@@ -508,7 +597,7 @@ public class MrpWizPrsSaveBean
hashMap.put("chg_user",chgUser); hashMap.put("chg_user",chgUser);
hashMap.put("chg_term",chgTerm); hashMap.put("chg_term",chgTerm);
hashMap.put("chg_date", date ); hashMap.put("chg_date", date );
System.out.println("CALLING updateInvallocTrace() --"); System.out.println("CALLING updateInvallocTrace() -hashMap["+hashMap+"]");
invAllocTrace = new InvAllocTraceBean(); invAllocTrace = new InvAllocTraceBean();
errString = invAllocTrace.updateInvallocTrace(hashMap, conn); errString = invAllocTrace.updateInvallocTrace(hashMap, conn);
System.out.println("updateInvallocTrace 1....."+errString); System.out.println("updateInvallocTrace 1....."+errString);
...@@ -874,6 +963,15 @@ public class MrpWizPrsSaveBean ...@@ -874,6 +963,15 @@ public class MrpWizPrsSaveBean
return ""; return "";
} }
private String checkNull(String input)
{
if(input == null)
{
input = "";
}
return input;
}
private String generateTranId( String windowName, String siteCode, Connection conn )throws ITMException private String generateTranId( String windowName, String siteCode, Connection conn )throws ITMException
{ {
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ ef3036af
...@@ -18,45 +18,72 @@ package ibase.webitm.ejb.mfg; ...@@ -18,45 +18,72 @@ package ibase.webitm.ejb.mfg;
6. in of case mfgtype = "O" create workorder instead of mps order 6. in of case mfgtype = "O" create workorder instead of mps order
*/ */
import org.w3c.dom.*; import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import java.rmi.RemoteException; import ibase.webitm.ejb.ITMDBAccessEJB;
import java.util.*; import ibase.webitm.ejb.ProcessEJB;
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.webitm.ejb.dis.DistCommon; import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.FinCommon; import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.mfg.adv.WorkorderPrc;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
import ibase.system.config.*;
import ibase.utility.CommonConstants;
import javax.ejb.Stateless; // added for ejb3 import java.io.BufferedReader;
//12/04/10 manoharan MF90BHU003 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.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFDataFormat; 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.xssf.usermodel.*;
//import org.apache.poi.ss.util.CellRangeAddress; //import org.apache.poi.ss.util.CellRangeAddress;
//import org.apache.poi.ss.usermodel.*; //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 //end 12/04/10 manoharan MF90BHU003
...@@ -223,9 +250,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -223,9 +250,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String roundingRequired=""; String roundingRequired="";
int bomLevel=0; int bomLevel=0;
String[] arrStr = null; String[] arrStr = null;
String xtraParams="";
public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException 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; String resultString = null;
Document dom = null, dom1 = null; Document dom = null, dom1 = null;
String retString = null; String retString = null;
...@@ -291,8 +320,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -291,8 +320,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
this.wnName=windowName; this.wnName=windowName;
long endTime = 0, totalTime = 0, totalHrs = 0, totlMts = 0, totSecs = 0; // Added 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 :" + // System.out.println("Initial Size of Item Has Map :" +
...@@ -4754,7 +4789,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -4754,7 +4789,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
for(int i=0;i<altItemlist.size();i++) for(int i=0;i<altItemlist.size();i++)
{ {
String altItem[]=altItemlist.get(i).split("@"); 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])); adpElement.getDetList().add(getAltItemSupply(adpElement.getSiteCode(),altItem[0],altItem[1]));
} }
} }
...@@ -7354,7 +7389,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7354,7 +7389,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
conn = connDriver.getConnectDB("DriverITM"); 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 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
...@@ -8727,6 +8762,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -8727,6 +8762,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double noArt=0,netWeight=0; double noArt=0,netWeight=0;
String feedbackReqd=""; String feedbackReqd="";
boolean insertFlag = true; // added by cpatil for new req
ArrayList<String> tranIdList = new ArrayList<String>();
try try
{ {
System.out.println("@@@@@@@@@cpatil:InsertPlanDemand called----winName["+winName+"] list["+list+"]--------"); System.out.println("@@@@@@@@@cpatil:InsertPlanDemand called----winName["+winName+"] list["+list+"]--------");
...@@ -8853,7 +8891,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -8853,7 +8891,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// added by sabyasachi 30-03-11 // added by sabyasachi 30-03-11
saleOrder = mpsOrder.saleOrder; saleOrder = mpsOrder.saleOrder;
lineNo = mpsOrder.lineNo; 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 if( "".equalsIgnoreCase(projCode) || ( projCode != null && projCode.trim().length() == 0 )) //FK_WORKORDER_PROJ added for exception
{ {
projCode = null; projCode = null;
...@@ -8900,7 +8938,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -8900,7 +8938,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
noArt = 0 ; noArt = 0 ;
netWeight = 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+"]"); System.out.println("for workorder...["+workOrder+"]bomCode["+bomCode+"]ordType["+ordType+"]");
workOrder = getUniqueKey(xmlValues, mpsKeyStr, "work_order", "W-ORD"); workOrder = getUniqueKey(xmlValues, mpsKeyStr, "work_order", "W-ORD");
pstmtWorkOrder.setString(1, workOrder); pstmtWorkOrder.setString(1, workOrder);
...@@ -9007,7 +9045,21 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -9007,7 +9045,21 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
WOtranId = workOrder; WOtranId = workOrder;
} else } else
{ {
System.out.println("for MpsOrder...itemCode["+itemCode+"]addnOrder["+addnOrder+"]");
System.out.println("for MpsOrder...itemCode["+itemCode+"]addnOrder["+addnOrder+"]mpsOrder.mfgType["+mpsOrder.mfgType+"]orderType["+orderType+"]");
/*
if( isDetailReq ) // added on 14/10/15 @supreme
{
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"); tranIdMpsOrder = getUniqueKey(xmlValues, mpsKeyStr, "tran_id", "W-MPS");
pstmtMpsOrder.setString(1, tranIdMpsOrder); pstmtMpsOrder.setString(1, tranIdMpsOrder);
pstmtMpsOrder.setString(2, ordType); pstmtMpsOrder.setString(2, ordType);
...@@ -9074,14 +9126,43 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -9074,14 +9126,43 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pstmtMpsOrder.setString(29,""); pstmtMpsOrder.setString(29,"");
} }
// **************pstmtMpsOrder.setDouble(25, demandQty); // **************pstmtMpsOrder.setDouble(25, demandQty);
pstmtMpsOrder.addBatch(); pstmtMpsOrder.addBatch();
WOtranId = tranIdMpsOrder; 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+"]");
}*/
}
// System.out.println("Inserting mpsorder # " + count + // System.out.println("Inserting mpsorder # " + count +
// " : " + tranIdMpsOrder); // " : " + tranIdMpsOrder);
...@@ -9443,6 +9524,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -9443,6 +9524,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// Commented by Jiten 31/10/06 - error -null pointer Exception // Commented by Jiten 31/10/06 - error -null pointer Exception
// pstmtMpsOrder.clearParameters(); // pstmtMpsOrder.clearParameters();
pstmtMpsOrder.close(); pstmtMpsOrder.close();
// End // End
// conn.commit(); // conn.commit();
...@@ -9464,6 +9548,23 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -9464,6 +9548,23 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// pstmtIndDemand.clearParameters();//Commented by Jiten 14/11/06 as // pstmtIndDemand.clearParameters();//Commented by Jiten 14/11/06 as
// giving null pointer exception // giving null pointer exception
pstmtIndDemand.close(); 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(); 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 Mps Order : [" + rowsInsertedMpsOrder.length + "]");
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPWiz.java
View file @ ef3036af
...@@ -539,7 +539,9 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz ...@@ -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 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 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 ( 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)) 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 ...@@ -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 "+ " 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')) "+ " 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 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 = connOne.prepareStatement(sql);
pstmt.setString(1,campNo); pstmt.setString(1,campNo);
...@@ -1475,7 +1476,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -1475,7 +1476,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
hashMap.put("chg_term", GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams, "termId")); hashMap.put("chg_term", GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams, "termId"));
hashMap.put("loc_code__fr",rs.getString("loc_code")); hashMap.put("loc_code__fr",rs.getString("loc_code"));
hashMap.put("exp_lev",rs.getString("exp_lev")); 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) if (distStkUpd.updAllocTrace(hashMap, connOne) > 0)
{ {
System.out.println("distStkUpd.UpdAllocTrace(HashMap, Connection) : Sucessuful!"); System.out.println("distStkUpd.UpdAllocTrace(HashMap, Connection) : Sucessuful!");
......
webitm-mfg/ibase/webitm/ejb/mfg/adv/WorkorderPrc.java
View file @ ef3036af
...@@ -476,11 +476,45 @@ public class WorkorderPrc extends ProcessEJB implements WorkorderPrcLocal,Worko ...@@ -476,11 +476,45 @@ public class WorkorderPrc extends ProcessEJB implements WorkorderPrcLocal,Worko
return errString; return errString;
}//END OF PROCESS(2) }//END OF PROCESS(2)
private String calWorkorderPrc(ArrayList tranList,Connection conn) throws Exception,ITMException 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;
}
public String calWorkorderPrc(ArrayList tranList,Connection conn, String xtraParams) throws Exception,ITMException
{
System.out.println("@@@@@@@@@@@ calWorkorderPrc()............");
ResultSet rs1 = null,rsSql1=null,rsSql2=null; ResultSet rs1 = null,rsSql1=null,rsSql2=null;
PreparedStatement pstmt = null,pstmtInsert=null,pstmtUpdate=null,pstmtSql1=null,pstmtSql2=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; int i=0;
double quantity=0.0; double quantity=0.0;
double yieldPerc=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