Skip to content

B
business-java
Commit a0bf37f1 authored by smestry's avatar smestry
Browse files
Options

Updated the class file for PO Autosave, to sort the detail3 according to item parent. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103169 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 80d3b3f0
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 18 deletions
webitm-wms/ibase/webitm/ejb/wms/DDPorderWizEJB.java
View file @ a0bf37f1
...@@ -18,6 +18,9 @@ import java.util.ArrayList; ...@@ -18,6 +18,9 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
...@@ -865,9 +868,14 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -865,9 +868,14 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
valueXmlString.append("<udf_str__3>").append("<![CDATA["+checkNullAndTrim(udfStr3)+"]]>").append("</udf_str__3>\r\n"); valueXmlString.append("<udf_str__3>").append("<![CDATA["+checkNullAndTrim(udfStr3)+"]]>").append("</udf_str__3>\r\n");
valueXmlString.append("<delivery_term_descr>").append("<![CDATA["+dlvTermDescr+"]]>").append("</delivery_term_descr>\r\n"); valueXmlString.append("<delivery_term_descr>").append("<![CDATA["+dlvTermDescr+"]]>").append("</delivery_term_descr>\r\n");
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
//Changed by Samadhan on 14/07/2015 D15CKAT026 start
for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++) HashMap<String, ArrayList> tempMap = new HashMap<String, ArrayList>();
{ ArrayList tempList = null;
String itemParnt = "", itemSer = "";
//Changed by Samadhan on 14/07/2015 D15CKAT026 start
for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++)
{
Node childNode = detail2NodeList.item(ctr); Node childNode = detail2NodeList.item(ctr);
if(childNode != null && childNode.getNodeType() != childNode.ELEMENT_NODE) if(childNode != null && childNode.getNodeType() != childNode.ELEMENT_NODE)
...@@ -881,11 +889,29 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -881,11 +889,29 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
Node itmNode = childList.item(ctrCh); Node itmNode = childList.item(ctrCh);
// Changed by Sneha on 25-08-2016, to sort item code according to parent code [Start]
System.out.println("Current Node Name ["+itmNode.getNodeName()+"]"); System.out.println("Current Node Name ["+itmNode.getNodeName()+"]");
if(itmNode !=null && ("item_code").equalsIgnoreCase(itmNode.getNodeName())) if(itmNode !=null && ("item_code").equalsIgnoreCase(itmNode.getNodeName()))
{ {
itemCode = itmNode.getFirstChild().getNodeValue(); itemCode = itmNode.getFirstChild().getNodeValue();
sql = " select item_parnt, item_ser from item where item_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
rs = pstmt.executeQuery();
if ( rs.next() )
{
itemParnt = checkNullAndTrim(rs.getString("item_parnt"));
itemSer = checkNullAndTrim(rs.getString("item_ser"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
} }
// Changed by Sneha on 25-08-2016, to sort item code according to parent code [End]
else if(itmNode !=null && ("quantity").equalsIgnoreCase(itmNode.getNodeName())) else if(itmNode !=null && ("quantity").equalsIgnoreCase(itmNode.getNodeName()))
{ {
quantity = itmNode.getFirstChild().getNodeValue(); quantity = itmNode.getFirstChild().getNodeValue();
...@@ -893,22 +919,74 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -893,22 +919,74 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
else if(itmNode !=null && ("dlv_date").equalsIgnoreCase(itmNode.getNodeName())) else if(itmNode !=null && ("dlv_date").equalsIgnoreCase(itmNode.getNodeName()))
{ {
dlvDate = itmNode.getFirstChild().getNodeValue(); dlvDate = itmNode.getFirstChild().getNodeValue();
} }
} }
// Changed by Sneha on 25-08-2016, to sort item code according to parent code [Start]
System.out.println("ItemCode ["+itemCode+"]quantity["+quantity+"]dlv_date["+dlvDate+"]"); System.out.println("itemParnt["+itemParnt+"]");
if(itemCode != null && itemCode.length() > 0) if(itemCode != null && itemCode.length() > 0)
{
String dataStr = itemCode + "~" + quantity + "~" + dlvDate;
if(tempMap.containsKey(itemParnt))
{
tempList = (ArrayList)tempMap.get(itemParnt);
}
else
{
tempList = new ArrayList();
}
tempList.add(dataStr);
tempMap.put(itemParnt, tempList);
itemParnt = "";
}
System.out.println("ItemCode ["+itemCode+"]quantity["+quantity+"]dlv_date["+dlvDate+"]");
/*if(itemCode != null && itemCode.length() > 0)
{ {
detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, ctr + 1, conn); detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, ctr + 1, conn);
System.out.println("detail3Str["+detail3Str+"]"); System.out.println("detail3Str["+detail3Str+"]");
valueXmlString.append(detail3Str+"\r\n"); valueXmlString.append(detail3Str+"\r\n");
}*/
}
ArrayList itemList = null;
Set keySet = tempMap.keySet();
Iterator it = keySet.iterator();
int count = 1;
String itemParent = "";
while(it.hasNext())
{
itemParent = (String) it.next();
itemList = tempMap.get(itemParent);
System.out.println(tempMap.get(itemParent));
System.out.println("Group Item Parant["+itemParnt+"]");
for(int i = 0; i< itemList.size(); i++)
{
String itemStr = (String) itemList.get(i);
String[] arr = itemStr.split("~");
itemCode = arr[0];
quantity = arr[1];
dlvDate = arr[2];
System.out.println("itemCode------"+arr[0]);
System.out.println("quantity------"+arr[1]);
System.out.println("dlvDate------"+arr[2]);
//detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, count++, itemParnt, itemSer, conn);
detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, count++, conn);
System.out.println("detail3Str["+detail3Str+"]");
valueXmlString.append(detail3Str+"\r\n");
} }
} }
// Changed by Sneha on 25-08-2016, to sort item code according to parent code [End]
}
break;
} }
break;
} }
}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1398,7 +1476,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1398,7 +1476,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
} }
@Override @Override
public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate, int ctr ,Connection conn) //public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate, int ctr , String itemParnt, String itemSer, Connection conn)
public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate, int ctr , Connection conn)
{ {
System.out.println("********Inside Porder Details***********"); System.out.println("********Inside Porder Details***********");
/* System.out.println(" itemCode inside getPorderDetails ==========>> " + itemCode); /* System.out.println(" itemCode inside getPorderDetails ==========>> " + itemCode);
......
webitm-wms/ibase/webitm/servlet/wms/ProdWizItemChangeServlet.java
View file @ a0bf37f1
...@@ -162,7 +162,6 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -162,7 +162,6 @@ public class ProdWizItemChangeServlet extends HttpServlet
//String sizeDetails = itemDetailsBean.getSizeDetails(sizeCode); //String sizeDetails = itemDetailsBean.getSizeDetails(sizeCode);
//E12GenericUtility genericUtility = new E12GenericUtility(); //E12GenericUtility genericUtility = new E12GenericUtility();
String retStr = ""; String retStr = "";
if ( action.equalsIgnoreCase( "GET_SIZE_DTL" ) ) if ( action.equalsIgnoreCase( "GET_SIZE_DTL" ) )
{ {
System.out.println("SIZECODE = ["+ sizeCode +"] OBJ_NAME = ["+ objName +"]"); System.out.println("SIZECODE = ["+ sizeCode +"] OBJ_NAME = ["+ objName +"]");
...@@ -277,7 +276,7 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -277,7 +276,7 @@ public class ProdWizItemChangeServlet extends HttpServlet
System.out.println("purcOrder Inside if GET_PURC_DET_2 = ["+ purcOrder +"]"); System.out.println("purcOrder Inside if GET_PURC_DET_2 = ["+ purcOrder +"]");
HashMap<String, String> hm = new HashMap<String, String>(); HashMap<String, String> hm = new HashMap<String, String>();
if(flag.equalsIgnoreCase("O") && purcOrder.equalsIgnoreCase("")) if(flag.equalsIgnoreCase("O") && purcOrder.equalsIgnoreCase("")) // Add mode
{ {
sqlSel = " SELECT PURC_ORDER FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? "; sqlSel = " SELECT PURC_ORDER FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? ";
pstmtSel = conn.prepareStatement(sqlSel); pstmtSel = conn.prepareStatement(sqlSel);
...@@ -301,7 +300,7 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -301,7 +300,7 @@ public class ProdWizItemChangeServlet extends HttpServlet
} }
sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY FROM PORDDET_TEMP P, ITEM I WHERE PURC_ORDER = ? " sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY FROM PORDDET_TEMP P, ITEM I WHERE PURC_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE "; + " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, P.ITEM_CODE ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrderTemp); pstmt.setString(1, purcOrderTemp);
...@@ -309,7 +308,7 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -309,7 +308,7 @@ public class ProdWizItemChangeServlet extends HttpServlet
else else
{ {
sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? " sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE "; + " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, P.ITEM_CODE ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder); pstmt.setString(1, purcOrder);
} }
...@@ -337,8 +336,13 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -337,8 +336,13 @@ public class ProdWizItemChangeServlet extends HttpServlet
} }
else else
{ {
//10115C****301761~02/06/16****301761::1||||10****301738~02/06/16****301738::2~301736::3
hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dlvDate + "****"+itemCode + "::" + quantity + "~")); hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dlvDate + "****"+itemCode + "::" + quantity + "~"));
} }
itemParent = "";
itemCode = "";
dlvDateDt = null;
quantity = "";
} }
if (rs != null) if (rs != null)
{ {
...@@ -629,11 +633,10 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -629,11 +633,10 @@ public class ProdWizItemChangeServlet extends HttpServlet
pstmtSel.close(); pstmtSel.close();
pstmtSel = null; pstmtSel = null;
} }
if(!detail[2].trim().equalsIgnoreCase("") && Integer.parseInt(detail[2]) > 0 && detail[6].equalsIgnoreCase("O")) if(!detail[2].trim().equalsIgnoreCase("") && Integer.parseInt(detail[2]) > 0 && detail[6].equalsIgnoreCase("O"))
//if((detail[2] != null || !detail[2].equalsIgnoreCase("")) || Integer.parseInt(detail[2]) > 0 ) //if((detail[2] != null || !detail[2].equalsIgnoreCase("")) || Integer.parseInt(detail[2]) > 0 )
{ {
System.out.println("111111111111---------");
sqlSel = "SELECT ITEM_CODE FROM PORDDET_TEMP PD WHERE PURC_ORDER = ? AND ITEM_CODE = ? "; sqlSel = "SELECT ITEM_CODE FROM PORDDET_TEMP PD WHERE PURC_ORDER = ? AND ITEM_CODE = ? ";
pstmtSel = conn.prepareStatement(sqlSel); pstmtSel = conn.prepareStatement(sqlSel);
pstmtSel.setString(1, purcOrderFrmHdr); // PURC_ORDER pstmtSel.setString(1, purcOrderFrmHdr); // PURC_ORDER
...@@ -726,7 +729,6 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -726,7 +729,6 @@ public class ProdWizItemChangeServlet extends HttpServlet
// Changed By Sneha on 29-06-2016, for PO Save [End] // Changed By Sneha on 29-06-2016, for PO Save [End]
System.out.println("retStr ====>> ["+retStr+"]"); System.out.println("retStr ====>> ["+retStr+"]");
//changed by Prasad on 08/06/15 [for multiple action] START //changed by Prasad on 08/06/15 [for multiple action] START
response.setContentType("text/xml"); response.setContentType("text/xml");
......
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