Skip to content

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

unit__sal from item master set as unit__alt 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91228 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f58909f3
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DistOrderAct.java
View file @ 7e6bd39a
...@@ -140,6 +140,7 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal, ...@@ -140,6 +140,7 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal,
String itemCode = ""; String itemCode = "";
String itemDescr = ""; String itemDescr = "";
String unit = ""; String unit = "";
String unitSal = "";
String stkDspDate = ""; String stkDspDate = "";
double rateClg = 0; double rateClg = 0;
StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n"); StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
...@@ -161,7 +162,7 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal, ...@@ -161,7 +162,7 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal,
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
System.out.println("Value From DOM :priceList:"+priceList+":siteCodeShip:"+siteCodeShip+":distOrder:"+distOrder); System.out.println("Value From DOM :priceList:"+priceList+":siteCodeShip:"+siteCodeShip+":distOrder:"+distOrder);
sql = "SELECT LINE_NO,QUANTITY,TAX_CLASS,TAX_CHAP,TAX_ENV,DSP_DATE, "+ sql = "SELECT LINE_NO,QUANTITY,TAX_CLASS,TAX_CHAP,TAX_ENV,DSP_DATE, "+
" ITEM_CODE__ORD,RATE__CLG FROM SORDDET "+ //added item_code__odd " ITEM_CODE,RATE__CLG FROM SORDDET "+
" WHERE SALE_ORDER ='"+saleOrder+"' AND "+ " WHERE SALE_ORDER ='"+saleOrder+"' AND "+
" LINE_NO NOT IN (SELECT LINE_NO__SORD FROM DISTORDER_DET "+ " LINE_NO NOT IN (SELECT LINE_NO__SORD FROM DISTORDER_DET "+
" WHERE DIST_ORDER ='"+distOrder+"' AND SALE_ORDER ='"+saleOrder+"')"; " WHERE DIST_ORDER ='"+distOrder+"' AND SALE_ORDER ='"+saleOrder+"')";
...@@ -190,15 +191,21 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal, ...@@ -190,15 +191,21 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal,
lineNo = " "+lineNo.trim() ; lineNo = " "+lineNo.trim() ;
lineNo= lineNo.substring((lineNo.length()-3),lineNo.length()); lineNo= lineNo.substring((lineNo.length()-3),lineNo.length());
System.out.println("lineNo:"+lineNo+":"); System.out.println("lineNo:"+lineNo+":");
sql="SELECT DESCR,UNIT FROM ITEM WHERE ITEM_CODE ='"+itemCode+"'"; // 27/02/10 manoharan unit__alt should be set as unit__sal of item
sql="SELECT DESCR,UNIT, UNIT__SAL FROM ITEM WHERE ITEM_CODE ='"+itemCode+"'";
System.out.println("DistOrderAddAll:actionAddAll:sql:"+sql); System.out.println("DistOrderAddAll:actionAddAll:sql:"+sql);
rs=stmt.executeQuery(sql); rs=stmt.executeQuery(sql);
if(rs.next()) if(rs.next())
{ {
itemDescr = rs.getString(1); itemDescr = rs.getString(1);
unit = rs.getString(2); unit = rs.getString(2);
unitSal = rs.getString(3); // 27/02/10 manoharan unit__alt should be set as unit__sal of item
} }
System.out.println("itemDescr:"+itemDescr+":unit:"+unit+":"); if (unitSal == null)
{
unitSal = unit;
}
//System.out.println("itemDescr:"+itemDescr+":unit:"+unit+":");
valueXmlString.append("<Detail>\r\n"); valueXmlString.append("<Detail>\r\n");
valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append("<![CDATA[").append(lineNo).append("]]>").append("</line_no__sord>\r\n"); valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append("<![CDATA[").append(lineNo).append("]]>").append("</line_no__sord>\r\n");
valueXmlString.append("<qty_order isSrvCallOnChg='0'>").append("<![CDATA[").append(quantity).append("]]>").append("</qty_order>\r\n"); valueXmlString.append("<qty_order isSrvCallOnChg='0'>").append("<![CDATA[").append(quantity).append("]]>").append("</qty_order>\r\n");
...@@ -210,6 +217,7 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal, ...@@ -210,6 +217,7 @@ public class DistOrderAct extends ActionHandlerEJB implements DistOrderActLocal,
valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode== null?"":itemCode.trim()).append("]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode== null?"":itemCode.trim()).append("]]>").append("</item_code>\r\n");
valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(itemDescr== null?"":itemDescr.trim()).append("]]>").append("</item_descr>\r\n"); valueXmlString.append("<item_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(itemDescr== null?"":itemDescr.trim()).append("]]>").append("</item_descr>\r\n");
valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit==null?"":unit.trim()).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit==null?"":unit.trim()).append("]]>").append("</unit>\r\n");
valueXmlString.append("<unit__alt isSrvCallOnChg='0'>").append("<![CDATA[").append(unitSal==null?"":unitSal.trim()).append("]]>").append("</unit__alt>\r\n");
valueXmlString.append("<rate isSrvCallOnChg='0'>").append("<![CDATA[").append(rateClg).append("]]>").append("</rate>\r\n"); valueXmlString.append("<rate isSrvCallOnChg='0'>").append("<![CDATA[").append(rateClg).append("]]>").append("</rate>\r\n");
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
}//end While }//end While
......
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