Commit 614ed5ed authored by dpawar's avatar dpawar

added new functionality


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97200 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e43d841f
...@@ -830,9 +830,10 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -830,9 +830,10 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
{ {
System.out.println("item change form 3........"); System.out.println("item change form 3........");
ArrayList<String> ptcnList = null; ArrayList<String> ptcnList = null;
HashMap<String,String> ptcnMap =new HashMap<String,String>();
String pickOrder = "" ,saleOrderL = "",itemCode = "" ,locCode = "" ,lotNo = "" ,lotSl = "",subSql = "", String pickOrder = "" ,saleOrderL = "",itemCode = "" ,locCode = "" ,lotNo = "" ,lotSl = "",subSql = "",
ptcnNo = "" ,mark = "",cartonNo = "",itemDescr = "",outerCartenNo = "",sorderLine = ""; ptcnNo = "" ,mark = "",cartonNo = "",itemDescr = "",outerCartenNo = "",sorderLine = "";
int noArt = 0,count = 0,domId = 0 ; int noArt = 0,count = 0,domId = 0,pstmtCount=0 ;
double quantity = 0,deAllQuantity = 0; double quantity = 0,deAllQuantity = 0;
tranId = checkNull(genericUtility.getColumnValue( "tran_id", hdrDataDom )); tranId = checkNull(genericUtility.getColumnValue( "tran_id", hdrDataDom ));
String qty = checkNull(genericUtility.getColumnValue( "quantity", allFormDataDom )); String qty = checkNull(genericUtility.getColumnValue( "quantity", allFormDataDom ));
...@@ -845,11 +846,11 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -845,11 +846,11 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) ) if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{ {
System.out.println("item change form 3........itm_default"); System.out.println("item change form 3........itm_default");
ptcnList = getPtcnNo("ptcn", allFormDataDom, "2"); ptcnMap = getPtcnNo("ptcn", allFormDataDom, "2");
System.out.println("ptcnList@----->"+ptcnList); System.out.println("ptcnMap@----->"+ptcnMap);
for(int i=0 ;i < ptcnList.size();i++) for(Map.Entry<String, String> entry : ptcnMap.entrySet())
{ {
subSql = subSql + ","+ptcnList.get(i); subSql = subSql + ","+entry.getValue();
} }
subSql = subSql.substring(1,subSql.length()) ; subSql = subSql.substring(1,subSql.length()) ;
System.out.println("@@@ sql in @@@ :["+subSql+"]"); System.out.println("@@@ sql in @@@ :["+subSql+"]");
...@@ -860,7 +861,7 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -860,7 +861,7 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
+ "FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER IN " + "FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER IN "
+ "(SELECT REF_ID FROM WAVE_TASK_DET WHERE PTCN IN ("); + "(SELECT REF_ID FROM WAVE_TASK_DET WHERE PTCN IN (");
for (int i= 0;i < ptcnList.size();i++) for(Map.Entry<String, String> entry : ptcnMap.entrySet())
{ {
mark = mark + "?,"; mark = mark + "?,";
} }
...@@ -871,9 +872,9 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -871,9 +872,9 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
+ "ORDER BY PODET.LOC_CODE, PODET.ITEM_CODE"); + "ORDER BY PODET.LOC_CODE, PODET.ITEM_CODE");
System.out.println("sqlBuf : "+sqlBuf.toString()); System.out.println("sqlBuf : "+sqlBuf.toString());
pstmt = conn.prepareStatement(sqlBuf.toString()); pstmt = conn.prepareStatement(sqlBuf.toString());
for (int i= 0;i < ptcnList.size();i++) for(Map.Entry<String, String> entry : ptcnMap.entrySet())
{ {
pstmt.setString(i+1, ptcnList.get(i)); pstmt.setString(++pstmtCount,entry.getValue());
} }
rs =pstmt.executeQuery(); rs =pstmt.executeQuery();
...@@ -896,12 +897,16 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -896,12 +897,16 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
deAllQuantity = rs.getDouble("DEALLOC_QTY"); deAllQuantity = rs.getDouble("DEALLOC_QTY");
sorderLine = checkNull(rs.getString("LINE_NO__SORD")); sorderLine = checkNull(rs.getString("LINE_NO__SORD"));
if(ptcnList !=null && ptcnList.size() > 0) /*if(ptcnList !=null && ptcnList.size() > 0)
{ {
ptcnNo = ptcnList.get(count); ptcnNo = ptcnList.get(count);
} }*/
count++; count++;
if(ptcnMap !=null && ptcnMap.size() > 0)
{
ptcnNo = ptcnMap.get(saleOrderL);
}
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n"); valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n");
//valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); //valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
...@@ -970,12 +975,15 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -970,12 +975,15 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
cartonNo = checkNull(rs.getString("CARTON_NO")); cartonNo = checkNull(rs.getString("CARTON_NO"));
deAllQuantity = rs.getDouble("DEALLOC_QTY"); deAllQuantity = rs.getDouble("DEALLOC_QTY");
sorderLine = checkNull(rs.getString("LINE_NO__SORD")); sorderLine = checkNull(rs.getString("LINE_NO__SORD"));
if(ptcnList !=null && ptcnList.size() > 0) /*if(ptcnList !=null && ptcnList.size() > 0)
{ {
ptcnNo = ptcnList.get(count); ptcnNo = ptcnList.get(count);
} }*/
count++; count++;
if(ptcnMap !=null && ptcnMap.size() > 0)
{
ptcnNo = ptcnMap.get(saleOrderL);
}
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n"); valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
...@@ -1229,43 +1237,39 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -1229,43 +1237,39 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
} }
return lineNo; return lineNo;
} }
public ArrayList<String> getPtcnNo(String colName, Document dom, String formNo) public HashMap<String,String> getPtcnNo(String colName, Document dom, String formNo)
{ {
ArrayList<String> colVal = new ArrayList<String>(); ArrayList<String> colVal = new ArrayList<String>();
Node elementName = null, parentNode = null; HashMap<String,String> colMap = new HashMap<String,String>();
NodeList elementList = null; NodeList parentNodeList = null;
Element elementAttr = null; NodeList childNodeList = null;
Node parentNode = null;
Node childNode = null;
int childNodeListLength = 0;
String childNodeName = null,ptcn = "",oldPtcn = "",saleOrder = "";
GenericUtility genericUtility = GenericUtility.getInstance();
String columnName = ""; String columnName = "";
String columnValue = null; String columnValue = null;
boolean continueLoop = true; boolean continueLoop = true;
boolean isFormNo = false; boolean isFormNo = false;
int ctr;
try try
{ {
elementList = dom.getElementsByTagName(colName); parentNodeList = dom.getElementsByTagName("Detail2");
if (Integer.parseInt(formNo) < 1) childNodeListLength = parentNodeList.getLength();
{ System.out.println("childNodeListLength----->>"+childNodeListLength);
isFormNo = true; for (int ctr = 0; ctr < childNodeListLength; ctr++)
} {
for(ctr = 0; ctr < elementList.getLength(); ctr++) childNode = parentNodeList.item(ctr);
{ childNodeName = childNode.getNodeName();
elementName = elementList.item(ctr); System.out.println("Child name --->> "+childNodeName);
parentNode = elementName.getParentNode();
elementAttr = (Element)parentNode; if (childNode.getNodeType() == Node.ELEMENT_NODE)
if(elementAttr.getAttribute("objContext").equals(formNo) || elementAttr.getAttribute("formno").equals(formNo) || isFormNo)
{ {
columnName = elementName.getNodeName(); Element eElement = (Element) childNode;
columnValue = ""; ptcn = checkNull(eElement.getElementsByTagName("ptcn").item(0).getTextContent());
if(elementName.getFirstChild()!=null) saleOrder = checkNull(eElement.getElementsByTagName("sale_order").item(0).getTextContent());
{ System.out.println("sale_order0----->"+saleOrder+ " PTCN --->["+ptcn+"]");
columnValue = elementName.getFirstChild().getNodeValue(); colMap.put(saleOrder,ptcn);
colVal.add(columnValue);
}
else
{
columnValue = null;
colVal.add(columnValue);
}
} }
} }
} }
...@@ -1274,15 +1278,8 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -1274,15 +1278,8 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
System.out.println("Exception : [getPtcnNo(2)] :==>\n"+e.getMessage()); System.out.println("Exception : [getPtcnNo(2)] :==>\n"+e.getMessage());
} }
finally
{ return colMap;
elementName = null;
parentNode = null;
elementList = null;
elementAttr = null;
columnName = null;
}
return colVal;
} }
private String getSiteCode( String xtraParams, Connection conn ) throws ITMException private String getSiteCode( String xtraParams, Connection conn ) throws ITMException
{ {
......
...@@ -13,9 +13,12 @@ import java.sql.Connection; ...@@ -13,9 +13,12 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
@javax.ejb.Stateless @javax.ejb.Stateless
public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizPosLocal, MultiplePtcnWizPosRemote public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizPosLocal, MultiplePtcnWizPosRemote
...@@ -44,32 +47,84 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP ...@@ -44,32 +47,84 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
Document dom = null; Document dom = null;
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
String errorString = "",sql = ""; String errorString = "",sql = "",ptcn= "",saleOrder= "",childNodeName = "",mark = "";
int count = 0,nodeLength = 0,cnt = 0; int count = 0,nodeLength = 0,cnt = 0,childNodeListLength= 0;
NodeList detail3List = null; Node parentNode = null;
Node childNode = null;
NodeList detail3List = null,detail2List = null;
NodeList childNodeList = null;
MultiplePtcnWizConf MultiplePtcnWizConfobj = null; MultiplePtcnWizConf MultiplePtcnWizConfobj = null;
NodeList parentNodeList = null;
ArrayList<String> sorderList = new ArrayList <String>();
HashMap<String,Integer> sorderItemCountMap = new HashMap<String,Integer> ();
StringBuffer sqlBuf = new StringBuffer();
int pstmtCnt = 0;
try try
{ {
conn.setAutoCommit(false); conn.setAutoCommit(false);
dom = genericUtility.parseString(domString); dom = genericUtility.parseString(domString);
if(dom != null) if(dom != null)
{ {
detail3List = dom.getElementsByTagName("Detail3"); parentNodeList = dom.getElementsByTagName("Detail2");
System.out.println("parentNode >>>{"+parentNode+"}");
int nodeCnt = parentNodeList.getLength();
System.out.println("nodeCnt >>>{"+nodeCnt+"}");
if(nodeCnt > 0)
{
childNodeListLength = parentNodeList.getLength();
System.out.println("childNodeListLength----->>"+childNodeListLength);
for (int ctr = 0; ctr < childNodeListLength; ctr++)
{
childNode = parentNodeList.item(ctr);
childNodeName = childNode.getNodeName();
System.out.println("Child name --->> "+childNodeName);
if (childNode.getNodeType() == Node.ELEMENT_NODE)
{
Element eElement = (Element) childNode;
ptcn = eElement.getElementsByTagName("ptcn").item(0).getTextContent();
saleOrder = eElement.getElementsByTagName("sale_order").item(0).getTextContent();
saleOrder = saleOrder == null ? "" : saleOrder.trim();
System.out.println("ptcn --->> "+ptcn);
System.out.println("saleOrder --->> "+saleOrder);
sorderList.add(saleOrder);
}
}
}
} }
sql = "select count(*) from multi_pick_iss_hdr where tran_id = ? "; System.out.println("saleOrder List-------->>"+sorderList);
pstmt = conn.prepareStatement(sql); if(sorderList.size() > 0)
pstmt.setString(1, tranId); {
rs = pstmt.executeQuery(); sqlBuf.append("SELECT COUNT(*) FROM PICK_ORD_DET WHERE SALE_ORDER IN ( ");
if(rs.next()) for(int i = 0; i < sorderList.size(); i++)
{ {
count = rs.getInt(1); mark = mark + "?,";
}
mark = mark.substring(0,mark.length() - 1);
sqlBuf.append(mark);
sqlBuf.append( ")");
pstmt = conn.prepareStatement(sqlBuf.toString());
for (String list : sorderList)
{
pstmt.setString(++pstmtCnt,list);
}
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
} }
rs.close(); System.out.println("PICK_ORD_DET count--------->>"+count);
rs = null;
pstmt.close();
pstmt = null;
sql = "select count(*) from multi_pick_iss_det where tran_id = ? "; sql = "SELECT COUNT(*) FROM MULTI_PICK_ISS_DET WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -81,14 +136,11 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP ...@@ -81,14 +136,11 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("multi_pick_iss_hdr count---->>["+count+"]");
System.out.println("multi_pick_iss_det count---->>["+cnt+"]"); System.out.println("multi_pick_iss_det count---->>["+cnt+"]");
nodeLength = detail3List.getLength(); //nodeLength = detail3List.getLength();
System.out.println("nodeLength count---->>["+nodeLength+"]"); if( count != 0 && cnt == count)
if(detail3List != null && count != 0 && cnt == count)
{ {
MultiplePtcnWizConfobj = new MultiplePtcnWizConf(); MultiplePtcnWizConfobj = new MultiplePtcnWizConf();
System.out.println("Detail3 length = "+detail3List.getLength());
errorString = MultiplePtcnWizConfobj.confirm( tranId, xtraParams,"", conn, false ) ; errorString = MultiplePtcnWizConfobj.confirm( tranId, xtraParams,"", conn, false ) ;
//errorString = confirmedMultiplePickIssue(tranId, xtraParams, conn); //errorString = confirmedMultiplePickIssue(tranId, xtraParams, conn);
...@@ -129,6 +181,26 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP ...@@ -129,6 +181,26 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
} }
return ""; return "";
} }
/*private boolean isPtcnConfirmed(ArrayList<String> ptcnList,Connection conn) throws Exception
{
ResultSet rs = null;
PreparedStatement pstmt = null;
String sql = "";
try
{
if(ptcnList !=null && ptcnList.size() > 0)
{
}
}
catch(Exception e)
{
e.printStackTrace();
throw new Exception(e);
}
}*/
private String confirmedMultiplePickIssue(String tranId,String xtraParams,Connection conn) throws Exception private String confirmedMultiplePickIssue(String tranId,String xtraParams,Connection conn) throws Exception
{ {
System.out.println("@@@@@@@@ Call confirmedMultiplePickIssue Method @@@@@@@@"); System.out.println("@@@@@@@@ Call confirmedMultiplePickIssue Method @@@@@@@@");
......
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