Skip to content

B
business-java
Commit fde914e6 authored by manohar's avatar manohar
Browse files
Options

changes done at SUN in case of sales order line number 3 charecter merged 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91368 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 278abdb3
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 14 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java
View file @ fde914e6
...@@ -1856,7 +1856,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -1856,7 +1856,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<tare_weight>").append("<![CDATA[").append(rs.getDouble(14)).append("]]>").append("</tare_weight>\r\n"); valueXmlString.append("<tare_weight>").append("<![CDATA[").append(rs.getDouble(14)).append("]]>").append("</tare_weight>\r\n");
valueXmlString.append("<net_weight>").append("<![CDATA[").append(rs.getDouble(15)).append("]]>").append("</net_weight>\r\n"); valueXmlString.append("<net_weight>").append("<![CDATA[").append(rs.getDouble(15)).append("]]>").append("</net_weight>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA[").append(rs.getInt(16)).append("]]>").append("</no_art>\r\n"); valueXmlString.append("<no_art>").append("<![CDATA[").append(rs.getInt(16)).append("]]>").append("</no_art>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append((rs.getString(17) == null) ? "":rs.getString(17)).append("]]>").append("</dimension>\r\n"); String dim = rs.getString(17); // 03/12/10 manoharan
if (dim == null || dim.trim().length() == 0)
{
dim = " ";
}
//valueXmlString.append("<dimension>").append("<![CDATA[").append((rs.getString(17) == null) ? " ":rs.getString(17)).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(dim).append("]]>").append("</dimension>\r\n");
// end 03/12/10
valueXmlString.append("<process_yn>").append("<![CDATA[").append(rs.getString(18)).append("]]>").append("</process_yn>\r\n"); valueXmlString.append("<process_yn>").append("<![CDATA[").append(rs.getString(18)).append("]]>").append("</process_yn>\r\n");
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
...@@ -1975,15 +1982,23 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -1975,15 +1982,23 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
lineNoOrd = rs.getString("LINE_NO__SORD"); lineNoOrd = rs.getString("LINE_NO__SORD");
} }
} }
// 03/12/10 manoharan
if (lineNoOrd.trim().length() == 1) if (lineNoOrd.trim().length() == 1)
{ {
spaces = " "; spaces = " ";
lineNoOrd = spaces.concat(lineNoOrd.trim());
} }
if (lineNoOrd.trim().length() == 2) else if (lineNoOrd.trim().length() == 2)
{ {
spaces = " "; spaces = " ";
}
lineNoOrd = spaces.concat(lineNoOrd.trim()); lineNoOrd = spaces.concat(lineNoOrd.trim());
}
else if (lineNoOrd.trim().length() == 3)
{
spaces = " ";
lineNoOrd = lineNoOrd.trim();
}
// end 03/12/10 manoharan
sqlStr = "SELECT EXP_LEV FROM SORDITEM WHERE SALE_ORDER ='"+invOrderNo+"'" sqlStr = "SELECT EXP_LEV FROM SORDITEM WHERE SALE_ORDER ='"+invOrderNo+"'"
+"AND LINE_NO ='"+lineNoOrd+"'"+" AND LINE_TYPE = 'I'"; +"AND LINE_NO ='"+lineNoOrd+"'"+" AND LINE_TYPE = 'I'";
rs = stmt.executeQuery(sqlStr); rs = stmt.executeQuery(sqlStr);
...@@ -2012,10 +2027,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -2012,10 +2027,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append("<![CDATA[").append(lineNoOrd).append("]]>").append("</line_no__sord>\r\n"); valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append("<![CDATA[").append(lineNoOrd).append("]]>").append("</line_no__sord>\r\n");
setNodeValue( dom, "line_no__sord", lineNoOrd ); setNodeValue( dom, "line_no__sord", lineNoOrd );
tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);//chg3 tempStr = getChangeSord(dom, dom1, "line_no__sord", xtraParams ,conn);//chg3
System.out.println("manohar 03/12/10 line_no__sord [" + lineNoOrd + "] tempStr [" + tempStr + "]");
valueXmlString.append(tempStr); valueXmlString.append(tempStr);
valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n"); valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n");
setNodeValue( dom, "exp_lev", expLev ); setNodeValue( dom, "exp_lev", expLev );
System.out.println("manohar 03/12/10 exp_lev [" + expLev + "]");
//expLev = getChangeSord(dom, dom1, "exp_lev", xtraParams ,conn);//chg4 //expLev = getChangeSord(dom, dom1, "exp_lev", xtraParams ,conn);//chg4
//valueXmlString.append(expLev); //valueXmlString.append(expLev);
valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n");
...@@ -2088,7 +2105,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -2088,7 +2105,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
} }
dimension = genericUtility.getColumnValueFromNode("dimension",currDetail); dimension = genericUtility.getColumnValueFromNode("dimension",currDetail);
dimension = (dimension == null ? "": dimension ); dimension = (dimension == null ? " ": dimension );
System.out.println("Double.parseDouble(qty.get(1).toString())"+Double.parseDouble(qty.get(1).toString())); System.out.println("Double.parseDouble(qty.get(1).toString())"+Double.parseDouble(qty.get(1).toString()));
//valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n"); //valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n");
setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString())); setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString()));
...@@ -3421,11 +3438,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -3421,11 +3438,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
+"FROM SORDDET LEFT OUTER JOIN PACKING ON SORDDET.PACK_CODE = PACKING.PACK_CODE LEFT OUTER JOIN UOM ON SORDDET.UNIT = UOM.UNIT, " +"FROM SORDDET LEFT OUTER JOIN PACKING ON SORDDET.PACK_CODE = PACKING.PACK_CODE LEFT OUTER JOIN UOM ON SORDDET.UNIT = UOM.UNIT, "
+"SORDER, " +"SORDER, "
+"SORDITEM " +"SORDITEM "
+"WHERE SORDER.SALE_ORDER = SORDDET.SALE_ORDER " +" WHERE SORDER.SALE_ORDER = SORDDET.SALE_ORDER "
+"AND SORDITEM.SALE_ORDER = SORDDET.SALE_ORDER " +" AND SORDITEM.SALE_ORDER = SORDDET.SALE_ORDER "
+"AND SORDITEM.LINE_NO = SORDDET.LINE_NO " +" AND SORDITEM.LINE_NO = SORDDET.LINE_NO "
+"AND SORDITEM.SALE_ORDER = '"+sordNo+"'" +" AND SORDITEM.SALE_ORDER = '"+sordNo+"'"
+"AND SORDITEM.LINE_TYPE = 'I' "; +" AND SORDITEM.LINE_TYPE = 'I' "
+" ORDER BY SORDITEM.LINE_NO, SORDITEM.EXP_LEV " ;
//End Changes Gulzar 12/03/07 //End Changes Gulzar 12/03/07
System.out.println("sql for all data ::"+sql); System.out.println("sql for all data ::"+sql);
rs = stmt.executeQuery(sql); rs = stmt.executeQuery(sql);
...@@ -5709,8 +5727,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -5709,8 +5727,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
if(currentColumn.equalsIgnoreCase("line_no__sord")) if(currentColumn.equalsIgnoreCase("line_no__sord"))
{ {
mcode = genericUtility.getColumnValue("line_no__sord",dom); mcode = genericUtility.getColumnValue("line_no__sord",dom);
valueXmlString.append("<line_no__sord isSrvCallOnChg='0' >").append("<![CDATA[").append(mcode == null ? "": mcode).append("]]>").append("</line_no__sord>\r\n"); valueXmlString.append("<line_no__sord isSrvCallOnChg='0' >").append("<![CDATA[").append(mcode == null ? " ": mcode).append("]]>").append("</line_no__sord>\r\n");
setNodeValue( dom, "line_no__sord", (mcode == null) ? "": mcode ); setNodeValue( dom, "line_no__sord", (mcode == null) ? " ": mcode );
mVal = genericUtility.getColumnValue("sord_no",dom); mVal = genericUtility.getColumnValue("sord_no",dom);
System.out.println("line_no__sord CASE....:"+mcode +"..."+mVal); System.out.println("line_no__sord CASE....:"+mcode +"..."+mVal);
sql = "select site_code,tax_class, tax_chap, tax_env, discount, rate__stduom,rate__clg ," sql = "select site_code,tax_class, tax_chap, tax_env, discount, rate__stduom,rate__clg ,"
...@@ -5947,7 +5965,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -5947,7 +5965,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<conv__rtuom_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum2).append("]]>").append("</conv__rtuom_stduom>\r\n");///13-08 valueXmlString.append("<conv__rtuom_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum2).append("]]>").append("</conv__rtuom_stduom>\r\n");///13-08
setNodeValue( dom, "conv__rtuom_stduom", (mNum2) ); setNodeValue( dom, "conv__rtuom_stduom", (mNum2) );
valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(mitemdesc).append("]]>").append("</item_descr>\r\n"); valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(mitemdesc).append("]]>").append("</item_descr>\r\n");
setNodeValue( dom, "item_descr", (mitemdesc == null) ? "" : mitemdesc ); setNodeValue( dom, "item_descr", (mitemdesc == null) ? " " : mitemdesc );
valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(mUnit).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(mUnit).append("]]>").append("</unit>\r\n");
setNodeValue( dom, "unit", (mUnit == null) ? "" : mUnit ); setNodeValue( dom, "unit", (mUnit == null) ? "" : mUnit );
valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStd).append("]]>").append("</rate__stduom>\r\n"); valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStd).append("]]>").append("</rate__stduom>\r\n");
...@@ -6903,7 +6921,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6903,7 +6921,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
packInstr = rs.getString(5); packInstr = rs.getString(5);
dimension = rs.getString(6); dimension = rs.getString(6);
dimension = (dimension == null ? "": dimension ); dimension = (dimension == null ? " ": dimension );
stcrate = rs.getDouble(7); stcrate = rs.getDouble(7);
grossWeightArt = rs.getDouble(8); grossWeightArt = rs.getDouble(8);
...@@ -7169,7 +7187,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -7169,7 +7187,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//rateStduom = Double.parseDouble(arrList.get(1).toString()); //rateStduom = Double.parseDouble(arrList.get(1).toString());
rateStduom = rateStd ; // 18-08 -10 rateStduom = rateStd ; // 18-08 -10
valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStduom).append("]]>").append("</rate__stduom>\r\n"); valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStduom).append("]]>").append("</rate__stduom>\r\n");
setNodeValue( dom, "dimension", (dimension == null) ? "" : dimension ); setNodeValue( dom, "dimension", (dimension == null) ? " " : dimension );
if(sordRate == 0 ) if(sordRate == 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