Skip to content

B
business-java
Commit ec9de21f authored by wansari's avatar wansari
Browse files
Options

updated source for delete button functionality and auto save for Non trade suppliers 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103919 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 35b5e006
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 86 deletions
webitm-wms/ibase/webitm/ejb/wms/DDPorderWizEJB.java
View file @ ec9de21f
...@@ -788,7 +788,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -788,7 +788,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
System.out.println(" -------- Inside itemchange case 33333333 ------------ "); System.out.println(" -------- Inside itemchange case 33333333 ------------ ");
//System.out.println("*****Case 3*****"); //System.out.println("*****Case 3*****");
String itemCode = "",quantity = "",detail3Str = "", dlvDate = ""; String itemCode = "",quantity = "",detail3Str = "", dlvDate = "",tabNo = "";
NodeList detail2NodeList = dom2.getElementsByTagName("Detail2"); NodeList detail2NodeList = dom2.getElementsByTagName("Detail2");
...@@ -924,12 +924,17 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -924,12 +924,17 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
dlvDate = itmNode.getFirstChild().getNodeValue(); dlvDate = itmNode.getFirstChild().getNodeValue();
} }
else if(itmNode !=null && ("form_no").equalsIgnoreCase(itmNode.getNodeName()))
{
tabNo = itmNode.getFirstChild().getNodeValue();
}
} }
// Changed by Sneha on 25-08-2016, to sort item code according to parent code [Start] // Changed by Sneha on 25-08-2016, to sort item code according to parent code [Start]
System.out.println("itemParnt["+itemParnt+"]"); System.out.println("itemParnt["+itemParnt+"]");
if(itemCode != null && itemCode.length() > 0) if(itemCode != null && itemCode.length() > 0)
{ {
String dataStr = itemCode + "~" + quantity + "~" + dlvDate; //String dataStr = itemCode + "~" + quantity + "~" + dlvDate;
String dataStr = itemCode + "~" + quantity + "~" + dlvDate + "~" + tabNo;
if(tempMap.containsKey(itemParnt)) if(tempMap.containsKey(itemParnt))
{ {
tempList = (ArrayList)tempMap.get(itemParnt); tempList = (ArrayList)tempMap.get(itemParnt);
...@@ -975,12 +980,15 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -975,12 +980,15 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
quantity = arr[1]; quantity = arr[1];
dlvDate = arr[2]; dlvDate = arr[2];
tabNo = arr[3];
System.out.println("itemCode------"+arr[0]); System.out.println("itemCode------"+arr[0]);
System.out.println("quantity------"+arr[1]); System.out.println("quantity------"+arr[1]);
System.out.println("dlvDate------"+arr[2]); 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++, itemParnt, itemSer, conn);
detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, count++, conn); //detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, count++, conn);
detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, tabNo, count++, conn);
System.out.println("detail3Str["+detail3Str+"]"); System.out.println("detail3Str["+detail3Str+"]");
valueXmlString.append(detail3Str+"\r\n"); valueXmlString.append(detail3Str+"\r\n");
...@@ -1439,7 +1447,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1439,7 +1447,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
@Override @Override
//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 , String itemParnt, String itemSer, Connection conn)
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,String tabNo, 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);
...@@ -1955,8 +1963,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1955,8 +1963,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
valueXmlString.append("<tax_class><![CDATA[").append(taxClass).append("]]></tax_class>"); valueXmlString.append("<tax_class><![CDATA[").append(taxClass).append("]]></tax_class>");
valueXmlString.append("<tax_chap><![CDATA[").append(taxChap).append("]]></tax_chap>"); valueXmlString.append("<tax_chap><![CDATA[").append(taxChap).append("]]></tax_chap>");
valueXmlString.append("<tax_env><![CDATA[").append(taxEnv).append("]]></tax_env>"); valueXmlString.append("<tax_env><![CDATA[").append(taxEnv).append("]]></tax_env>");
valueXmlString.append("<curr_code><![CDATA[").append(checkNullAndTrim(currCode)).append("]]></curr_code>");//Changed by wasim on 07-07-2015 for currCode valueXmlString.append("<curr_code><![CDATA[").append(checkNullAndTrim(currCode)).append("]]></curr_code>");//Changed by wasim on 07-07-2015 for currCode
} }
if( pstmt != null ) if( pstmt != null )
{ {
...@@ -1968,6 +1976,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1968,6 +1976,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
rs.close(); rs.close();
rs = null; rs = null;
} }
valueXmlString.append("<form_no><![CDATA[").append(tabNo).append("]]></form_no>\r\n");
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
} }
catch(Exception e) catch(Exception e)
...@@ -2084,7 +2094,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2084,7 +2094,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
String totAmt = ""; String totAmt = "";
String quantity = ""; String quantity = "";
String taxClass = "", taxChap = "", taxEnv = ""; String taxClass = "", taxChap = "", taxEnv = "",itemRef = "";
StringBuffer details = new StringBuffer("<root>"); StringBuffer details = new StringBuffer("<root>");
details.append("<finish>"); details.append("<finish>");
...@@ -2133,7 +2143,9 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2133,7 +2143,9 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
details.append("</finish>"); details.append("</finish>");
//sql = "SELECT ITEM_CODE,TOT_AMT,QUANTITY,TAX_AMT FROM PORDDET WHERE PURC_ORDER = ? "; //sql = "SELECT ITEM_CODE,TOT_AMT,QUANTITY,TAX_AMT FROM PORDDET WHERE PURC_ORDER = ? ";
sql = "SELECT ITEM_CODE,TOT_AMT,QUANTITY,TAX_AMT,TAX_CLASS,TAX_CHAP,TAX_ENV FROM PORDDET WHERE PURC_ORDER = ? "; //sql = "SELECT ITEM_CODE,TOT_AMT,QUANTITY,TAX_AMT,TAX_CLASS,TAX_CHAP,TAX_ENV FROM PORDDET WHERE PURC_ORDER = ? ";
sql = " SELECT P.ITEM_CODE,P.TOT_AMT,P.QUANTITY,P.TAX_AMT,P.TAX_CLASS,P.TAX_CHAP,P.TAX_ENV,I.PHY_ATTRIB_4 FROM PORDDET P,ITEM I WHERE P.PURC_ORDER = ? "
+ " AND P.ITEM_CODE = I.ITEM_CODE ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder); pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -2149,6 +2161,9 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2149,6 +2161,9 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
taxClass = checkNullAndTrim(rs.getString("TAX_CLASS")); taxClass = checkNullAndTrim(rs.getString("TAX_CLASS"));
taxChap = checkNullAndTrim(rs.getString("TAX_CHAP")); taxChap = checkNullAndTrim(rs.getString("TAX_CHAP"));
taxEnv = checkNullAndTrim(rs.getString("TAX_ENV")); taxEnv = checkNullAndTrim(rs.getString("TAX_ENV"));
itemRef = checkNullAndTrim(rs.getString("PHY_ATTRIB_4"));
domID++; domID++;
details.append("<extra>"); details.append("<extra>");
...@@ -2161,6 +2176,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2161,6 +2176,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
details.append("<tax_class><![CDATA[").append(taxClass).append("]]></tax_class>\r\n"); details.append("<tax_class><![CDATA[").append(taxClass).append("]]></tax_class>\r\n");
details.append("<tax_chap><![CDATA[").append(taxChap).append("]]></tax_chap>\r\n"); details.append("<tax_chap><![CDATA[").append(taxChap).append("]]></tax_chap>\r\n");
details.append("<tax_env><![CDATA[").append(taxEnv).append("]]></tax_env>\r\n"); details.append("<tax_env><![CDATA[").append(taxEnv).append("]]></tax_env>\r\n");
details.append("<item_ref><![CDATA[").append(itemRef).append("]]></item_ref>\r\n");
details.append("</extra>"); details.append("</extra>");
} }
...@@ -2228,6 +2245,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2228,6 +2245,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
int cntColors = 0, cntDimension = 0, cntSizes = 0; int cntColors = 0, cntDimension = 0, cntSizes = 0;
StringBuffer valueXmlString = null; StringBuffer valueXmlString = null;
try try
{ {
System.out.println("ItemParent["+itemParentData+"] Date["+itemDLVDate+"] Para Details["+paraData+"] otherDetails ["+otherDetails+"]"); System.out.println("ItemParent["+itemParentData+"] Date["+itemDLVDate+"] Para Details["+paraData+"] otherDetails ["+otherDetails+"]");
...@@ -2237,16 +2255,21 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2237,16 +2255,21 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
valueXmlString = new StringBuffer("<Root>\r\n"); valueXmlString = new StringBuffer("<Root>\r\n");
valueXmlString.append("<PRODUCT_SET selected = 'N'>\r\n"); valueXmlString.append("<PRODUCT_SET selected = 'N'>\r\n");
String itmcode = itemParentData;
String itmDLVDate [] = itemDLVDate.split("~"); String itmDLVDate [] = itemDLVDate.split("~");
String paraDatas [] = paraData.split("~"); String paraDatas [] = paraData.split("~");
String tranType = paraDatas[0]; String tranType = paraDatas[0];
System.out.println("TRANTYPE = ["+tranType+"]"); //String itmcode = itemParentData;
String itemData[] = itemParentData.split(":");
String itmcode = itemData[0];
String tabNum = itemData[1];
String DLVDate=""; String DLVDate="";
String dSizeDescr=""; String dSizeDescr="";
System.out.println("TRANTYPE = ["+tranType+"]");
if("T".equalsIgnoreCase(tranType)) if("T".equalsIgnoreCase(tranType))
{ {
valueXmlString.append("<TH_SET selected = 'N'>\r\n"); valueXmlString.append("<TH_SET selected = 'N'>\r\n");
...@@ -2267,6 +2290,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2267,6 +2290,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
dSizeDescr = checkNullAndTrim(rs.getString(3)); dSizeDescr = checkNullAndTrim(rs.getString(3));
sizeList.add(dSize); sizeList.add(dSize);
valueXmlString.append("<SET><![CDATA[").append(dSizeDescr).append("]]></SET>\r\n"); valueXmlString.append("<SET><![CDATA[").append(dSizeDescr).append("]]></SET>\r\n");
cntSizes++;
} }
if (rs != null) if (rs != null)
...@@ -2299,6 +2324,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2299,6 +2324,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
dColorDescr = checkNullAndTrim(rs.getString(2)); dColorDescr = checkNullAndTrim(rs.getString(2));
colorList.add(dColor); colorList.add(dColor);
colorData.put(dColor, dColorDescr); colorData.put(dColor, dColorDescr);
cntColors++;
} }
if (rs != null) if (rs != null)
{ {
...@@ -2325,6 +2352,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2325,6 +2352,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
dDimDescr = checkNullAndTrim(rs.getString(2)); dDimDescr = checkNullAndTrim(rs.getString(2));
dimensionList.add(dDim); dimensionList.add(dDim);
dimensionData.put(dDim,dDimDescr); dimensionData.put(dDim,dDimDescr);
cntDimension++;
} }
if (rs != null) if (rs != null)
{ {
...@@ -2460,17 +2489,24 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2460,17 +2489,24 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n"); //valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n");
valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" available in "+cntColors+" color(s) and "+cntSizes+" size(s) " )).append("]]></Descr>\r\n");
} }
pstmt.close(); if (rs != null)
rs.close(); {
rs.close();rs = null;
}
if (pstmt != null )
{
pstmt.close();pstmt = null;
}
if(itmDLVDate.length>1) if(itmDLVDate.length>1)
{ {
DLVDate = itmDLVDate[1];
valueXmlString.append("<DLVDate><![CDATA[").append(checkNullAndTrim(DLVDate)).append("]]></DLVDate>\r\n"); valueXmlString.append("<DLVDate><![CDATA[").append(checkNullAndTrim(DLVDate)).append("]]></DLVDate>\r\n");
} }
valueXmlString.append("<tab_no><![CDATA[").append(tabNum).append("]]></tab_no>\r\n");
valueXmlString.append("</RECORDS>\r\n"); valueXmlString.append("</RECORDS>\r\n");
...@@ -2503,7 +2539,18 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2503,7 +2539,18 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
if(paraDatas.length>1) if(paraDatas.length>1)
{ {
valueXmlString.append("<td><![CDATA[").append(itmcode+"~"+paraDatas[1]).append("]]></td>\r\n"); //Changed by wasim for edit mode [START]
//valueXmlString.append("<td><![CDATA[").append(itmcode+"~"+paraDatas[1]).append("]]></td>\r\n");
String [] qty = paraDatas[1].split("::");
if(qty.length > 1)
{
valueXmlString.append("<td><![CDATA[").append(itmcode+"~"+qty[1]).append("]]></td>\r\n");
}
else
{
valueXmlString.append("<td><![CDATA[").append(itmcode+"~"+paraDatas[1]).append("]]></td>\r\n");
}
//Changed by wasim for edit mode [END]
} }
else else
{ {
...@@ -2512,14 +2559,37 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2512,14 +2559,37 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
} }
valueXmlString.append("</tr>\r\n"); valueXmlString.append("</tr>\r\n");
valueXmlString.append("<tooltip><![CDATA[").append("Quantity").append("]]></tooltip>\r\n"); valueXmlString.append("<tooltip><![CDATA[").append("Quantity").append("]]></tooltip>\r\n");
valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n");
DLVDate = itemDLVDate; //valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n");
valueXmlString.append("<DLVDate><![CDATA[").append(checkNullAndTrim(DLVDate)).append("]]></DLVDate>\r\n"); valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" available in "+1+" color and "+1+" size " )).append("]]></Descr>\r\n");
System.out.println("Length="+itmDLVDate.length);
if(itmDLVDate.length>1)
{
valueXmlString.append("<DLVDate><![CDATA[").append(checkNullAndTrim(itmDLVDate[1])).append("]]></DLVDate>\r\n");
}
else
{
DLVDate = itemDLVDate;
valueXmlString.append("<DLVDate><![CDATA[").append(checkNullAndTrim(DLVDate)).append("]]></DLVDate>\r\n");
}
valueXmlString.append("<tab_no><![CDATA[").append(tabNum).append("]]></tab_no>\r\n");
valueXmlString.append("</RECORDS>\r\n"); valueXmlString.append("</RECORDS>\r\n");
valueXmlString.append("</PRODUCT_SET>\r\n"); valueXmlString.append("</PRODUCT_SET>\r\n");
valueXmlString.append("</Root>"); valueXmlString.append("</Root>");
} }
if (rs != null)
{
rs.close();rs = null;
}
if (pstmt != null )
{
pstmt.close();pstmt = null;
}
} }
}//End try }//End try
...@@ -2554,7 +2624,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2554,7 +2624,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
} }
} }
//System.out.println("return Product Set=["+valueXmlString.toString()+"]"); System.out.println("return Product Set=["+valueXmlString.toString()+"]");
return valueXmlString.toString(); return valueXmlString.toString();
} }
...@@ -2959,7 +3029,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2959,7 +3029,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
purcOrderTemp = checkNullAndTrim(rsSel.getString("PURC_ORDER")); purcOrderTemp = checkNullAndTrim(rsSel.getString("PURC_ORDER"));
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, P.TAB_NO FROM PORDDET_TEMP P, ITEM I WHERE PURC_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, 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);
...@@ -2979,11 +3049,11 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2979,11 +3049,11 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
//System.out.println("Inside 333333333 ["+ purcOrder +"]"); //System.out.println("Inside 333333333 ["+ purcOrder +"]");
sql = "SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? AND " sql = "SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.LINE_NO AS TAB_NO FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? AND "
+ "I.ITEM_CODE = P.ITEM_CODE AND P.Item_code not in (SELECT PT.ITEM_CODE FROM PORDDET_TEMP PT WHERE PURC_ORDER = ? ) " + "I.ITEM_CODE = P.ITEM_CODE AND P.Item_code not in (SELECT PT.ITEM_CODE FROM PORDDET_TEMP PT WHERE PURC_ORDER = ? ) "
+ "UNION " + "UNION "
+ "SELECT I.ITEM_PARNT, PT.ITEM_CODE, PT.DLV_DATE, PT.QUANTITY FROM PORDDET_TEMP PT, ITEM I WHERE PURC_ORDER = ? " + "SELECT I.ITEM_PARNT, PT.ITEM_CODE, PT.DLV_DATE, PT.QUANTITY, PT.TAB_NO FROM PORDDET_TEMP PT, ITEM I WHERE PURC_ORDER = ? "
+ "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY 1, 2 "; + "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder); pstmt.setString(1, purcOrder);
pstmt.setString(2, purcOrder); pstmt.setString(2, purcOrder);
...@@ -2996,8 +3066,22 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -2996,8 +3066,22 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE")); itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
dlvDateDt = rs.getDate("DLV_DATE"); dlvDateDt = rs.getDate("DLV_DATE");
quantity = checkNullAndTrim(rs.getString("QUANTITY")); quantity = checkNullAndTrim(rs.getString("QUANTITY"));
dlvDate = sdf.format(dlvDateDt).toString(); dlvDate = sdf.format(dlvDateDt).toString();
tabNum = checkNullAndTrim(rs.getString("TAB_NO"));
if(itemParent == null || itemParent.length() == 0)
{
itemParent = itemCode+":"+tabNum;
}
else
{
itemParent = itemParent+":"+tabNum;
}
System.out.println("Final Item Parent with Tab number="+itemParent);
if(hm.containsKey(itemParent)) if(hm.containsKey(itemParent))
{ {
String itemQtyStr = hm.get(itemParent); String itemQtyStr = hm.get(itemParent);
...@@ -3300,12 +3384,13 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -3300,12 +3384,13 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
conn = getConnection(); conn = getConnection();
System.out.println("Inside savePorderDetail ["+str+"]");
String[] detail = str.split("~"); String[] detail = str.split("~");
String purcOrderFrmHdr = ""; String purcOrderFrmHdr = "",pordType = "";
if(detail[6].equalsIgnoreCase("A")) // Status if(detail[6].equalsIgnoreCase("A")) // Status
{ {
sqlSel = " SELECT PURC_ORDER FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? "; sqlSel = " SELECT PURC_ORDER,PORD_TYPE FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? ";
pstmtSel = conn.prepareStatement(sqlSel); pstmtSel = conn.prepareStatement(sqlSel);
pstmtSel.setString(1, detail[6]); //Status pstmtSel.setString(1, detail[6]); //Status
pstmtSel.setString(2, detail[4]); // Emp_Code pstmtSel.setString(2, detail[4]); // Emp_Code
...@@ -3314,6 +3399,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -3314,6 +3399,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
if(rsSel.next()) if(rsSel.next())
{ {
purcOrderFrmHdr = rsSel.getString("PURC_ORDER"); purcOrderFrmHdr = rsSel.getString("PURC_ORDER");
pordType = rsSel.getString("PORD_TYPE");
} }
if(rsSel != null) if(rsSel != null)
{ {
...@@ -3335,89 +3421,106 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -3335,89 +3421,106 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
System.out.println("Inside delete acrrodian"); System.out.println("Inside delete acrrodian");
//sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) AND TAB_NO = ?"; //sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) AND TAB_NO = ?";
sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) "; //sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) ";
if("T".equalsIgnoreCase(pordType))
{
sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) AND TAB_NO = ? ";
}
else
{
sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_CODE = ?) AND TAB_NO = ? ";
}
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrderFrmHdr); pstmt.setString(1, purcOrderFrmHdr);
pstmt.setString(2, detail[1]); pstmt.setString(2, detail[1]);
pstmt.setString(3, detail[8]);
int upd = pstmt.executeUpdate(); int upd = pstmt.executeUpdate();
System.out.println("Deleted Items="+upd); System.out.println("Deleted Items="+upd);
if( pstmt != null ) if( pstmt != null )
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
return "";
} }
else
{ if(!detail[2].trim().equalsIgnoreCase("") && Integer.parseInt(detail[2]) > 0)
if(!detail[2].trim().equalsIgnoreCase("") && Integer.parseInt(detail[2]) > 0) {
//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 = ? AND TAB_NO = ?";
pstmtSel = conn.prepareStatement(sqlSel);
pstmtSel.setString(1, purcOrderFrmHdr); // PURC_ORDER
pstmtSel.setString(2, detail[1]);
pstmtSel.setString(3, detail[8]);
rsSel = pstmtSel.executeQuery();
if( rsSel.next() )
{ {
sqlSel = "SELECT ITEM_CODE FROM PORDDET_TEMP PD WHERE PURC_ORDER = ? AND ITEM_CODE = ? "; //sql = "UPDATE PORDDET_TEMP SET QUANTITY = ? WHERE PURC_ORDER = ? AND ITEM_CODE = ? ";
pstmtSel = conn.prepareStatement(sqlSel); sql = "UPDATE PORDDET_TEMP SET QUANTITY = ? WHERE PURC_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ? ";
pstmtSel.setString(1, purcOrderFrmHdr); // PURC_ORDER pstmt = conn.prepareStatement(sql);
pstmtSel.setString(2, detail[1]); // ITEM_CODE pstmt.setString(1, detail[2]); // QUANTITY
rsSel = pstmtSel.executeQuery(); pstmt.setString(2, purcOrderFrmHdr); // PURC_ORDER
if( rsSel.next() ) pstmt.setString(3, detail[1]); // ITEM_CODE
{ pstmt.setString(4, detail[8]);
sql = "UPDATE PORDDET_TEMP SET QUANTITY = ? WHERE PURC_ORDER = ? AND ITEM_CODE = ? "; pstmt.executeUpdate();
pstmt = conn.prepareStatement(sql); if(pstmt != null)
pstmt.setString(1, detail[2]); // QUANTITY
pstmt.setString(2, purcOrderFrmHdr); // PURC_ORDER
pstmt.setString(3, detail[1]); // ITEM_CODE
pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
else
{
dlvDate = genericUtility.getValidDateTimeString(
checkNullAndTrim(detail[3]), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
sql = "INSERT INTO PORDDET_TEMP(PURC_ORDER, SITE_CODE, ITEM_CODE, QUANTITY, DLV_DATE) "
+ " VALUES(?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrderFrmHdr); // PURC_ORDER
pstmt.setString(2, detail[0]); // SITE_CODE
pstmt.setString(3, detail[1]); // ITEM_CODE
pstmt.setString(4, detail[2]); // QUANTITY
pstmt.setTimestamp(5, java.sql.Timestamp.valueOf(dlvDate)); // DLV_DATE
pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
if(rsSel != null)
{
rsSel.close();
rsSel = null;
}
if(pstmtSel != null)
{ {
pstmtSel.close(); pstmt.close();
pstmtSel = null; pstmt = null;
} }
} }
else if(detail[2].trim().equalsIgnoreCase("") || Integer.parseInt(detail[2]) <= 0) // if Quantity is zero else
{ {
sql = "DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE = ? "; dlvDate = genericUtility.getValidDateTimeString(
checkNullAndTrim(detail[3]), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
sql = "INSERT INTO PORDDET_TEMP(PURC_ORDER, SITE_CODE, ITEM_CODE, QUANTITY, DLV_DATE, TAB_NO) "
+ " VALUES(?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrderFrmHdr); // PURC_ORDER pstmt.setString(1, purcOrderFrmHdr); // PURC_ORDER
pstmt.setString(2, detail[1]); // ITEM_CODE pstmt.setString(2, detail[0]); // SITE_CODE
pstmt.setString(3, detail[1]); // ITEM_CODE
pstmt.setString(4, detail[2]); // QUANTITY
pstmt.setTimestamp(5, java.sql.Timestamp.valueOf(dlvDate)); // DLV_DATE
pstmt.setString(6, detail[8]);
pstmt.executeUpdate(); pstmt.executeUpdate();
if( pstmt != null ) if(pstmt != null)
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
if(rsSel != null)
{
rsSel.close();
rsSel = null;
}
if(pstmtSel != null)
{
pstmtSel.close();
pstmtSel = null;
}
}
else if(detail[2].trim().equalsIgnoreCase("") || Integer.parseInt(detail[2]) <= 0) // if Quantity is zero
{
//sql = "DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE = ? ";
sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrderFrmHdr); // PURC_ORDER
pstmt.setString(2, detail[1]); // ITEM_CODE
pstmt.setString(3, detail[8]);
pstmt.executeUpdate();
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
} }
} }
catch (Exception e) catch (Exception e)
{ {
System.out.println("Inside catchs savePorderDetail");
e.printStackTrace(); e.printStackTrace();
isError = true; isError = true;
} }
...@@ -3425,6 +3528,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -3425,6 +3528,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{ {
try try
{ {
System.out.println("isError="+isError);
if(isError) if(isError)
{ {
conn.rollback(); conn.rollback();
......
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