Skip to content

B
business-java
Commit 15116088 authored by ssalve's avatar ssalve
Browse files
Options

Sarita: Done changes to set tax_class,tax_chap and tax_env on Purchase Receipt xml on 29MARCH2018 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182812 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a38e0954
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 6 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnConf.java
View file @ 15116088
......@@ -1288,21 +1288,21 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
//Added by sarita to set tax_class , tax_chap and tax_env in detail xml of porder[start] - 29MARCH2018
taxclassDet = distComm.getTaxClass("S", suppCode,itemCode, siteCode, conn);
taxchapDet = distComm.getTaxChap(itemCode, itemSer, "S",suppCode, siteCode, conn);
taxenvDet = distComm.getTaxEnv(stationstanCode, stationCodeto, taxchapDet, taxclassDet,siteCode, conn);
System.out.println("Detail Value Of [taxclassDet<"+taxclassDet+">] , [taxchapDet<"+taxchapDet+">] , [taxenvDet<"+taxenvDet+">]");
if(taxclassDet == null)
{
taxclassDet = taxclassHdr;
}
taxchapDet = distComm.getTaxChap(itemCode, itemSer, "S",suppCode, siteCode, conn);
if(taxchapDet == null)
{
taxchapDet = taxchapHdr;
}
taxenvDet = distComm.getTaxEnv(stationstanCode, stationCodeto, taxchapDet, taxclassDet,siteCode, conn);
if(taxenvDet == null)
{
taxenvDet = taxenvHdr;
}
}
System.out.println("Detail Value Of [taxclassDet<"+taxclassDet+">] , [taxchapDet<"+taxchapDet+">] , [taxenvDet<"+taxenvDet+">]");
//Added by sarita to set tax_class , tax_chap and tax_env in detail xml of porder[start] - 29MARCH2018
xmlString.append("<Detail2 dbID=':' domID='" + domID + "' objName='porder' objContext='2'>");
......@@ -1615,7 +1615,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
String userId = "";
String chgTerm = "";
String retString = "";
String porcptaxclassDet="", porcptaxchapDet="", porcptaxenvDet=""; // Added by sarita on 29MARCH2018
MasterStatefulLocal masterStatefulLocal = null;
ITMDBAccessEJB itmdbAccess = new ITMDBAccessEJB();
......@@ -1813,7 +1813,21 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
sql = "SELECT SHIPPER_SIZE, GROSS_WEIGHT, NET_WEIGHT FROM ITEM_LOT_PACKSIZE WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? ";
pstmtItemLotPack = conn.prepareStatement(sql);
//Added tax_class,tax_chap and tax_env
/*sql = "SELECT PDET.LINE_NO, PDET.ITEM_CODE, PDET.QUANTITY, PDET.UNIT, PDET.RATE, "+
"PDET.DISCOUNT, PDET.TAX_AMT, PDET.TOT_AMT, PDET.LOC_CODE, "+
"PDET.REQ_DATE, PDET.DLV_QTY, PDET.STATUS, PDET.STATUS_DATE, "+
"PDET.UNIT__RATE, PDET.CONV__QTY_STDUOM, PDET.CONV__RTUOM_STDUOM, "+
"PDET.UNIT__STD, PDET.QUANTITY__STDUOM, PDET.RATE__STDUOM, "+
"PDET.NO_ART, PDET.ACCT_CODE__DR, PDET.CCTR_CODE__DR, PDET.ACCT_CODE__CR, "+
"PDET.CCTR_CODE__CR, PDET.RATE__CLG, PDET.STD_RATE, ADET.LOT_NO, ADET.EXP_DATE, "+
"ITEM.CANC_BO_MODE, ITEM.SHELF_LIFE , PDET.RATE__CLG "+
"FROM PORDDET PDET, ASN_DET ADET, ITEM ITEM, ASN_HDR ASN_HDR "+
"WHERE ASN_HDR.PURC_ORDER = PDET.PURC_ORDER "+
"AND ASN_HDR.TRAN_ID = ADET.TRAN_ID "+
"AND PDET.PURC_ORDER = ? "+
"AND PDET.LINE_NO = ADET.LINE_NO__ORD "+
"AND PDET.ITEM_CODE = ITEM.ITEM_CODE ";*/
sql = "SELECT PDET.LINE_NO, PDET.ITEM_CODE, PDET.QUANTITY, PDET.UNIT, PDET.RATE, "+
"PDET.DISCOUNT, PDET.TAX_AMT, PDET.TOT_AMT, PDET.LOC_CODE, "+
"PDET.REQ_DATE, PDET.DLV_QTY, PDET.STATUS, PDET.STATUS_DATE, "+
......@@ -1821,6 +1835,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
"PDET.UNIT__STD, PDET.QUANTITY__STDUOM, PDET.RATE__STDUOM, "+
"PDET.NO_ART, PDET.ACCT_CODE__DR, PDET.CCTR_CODE__DR, PDET.ACCT_CODE__CR, "+
"PDET.CCTR_CODE__CR, PDET.RATE__CLG, PDET.STD_RATE, ADET.LOT_NO, ADET.EXP_DATE, "+
"PDET.TAX_CLASS,PDET.TAX_CHAP,PDET.TAX_ENV"+ //Added by sarita
"ITEM.CANC_BO_MODE, ITEM.SHELF_LIFE , PDET.RATE__CLG "+
"FROM PORDDET PDET, ASN_DET ADET, ITEM ITEM, ASN_HDR ASN_HDR "+
"WHERE ASN_HDR.PURC_ORDER = PDET.PURC_ORDER "+
......@@ -1847,6 +1862,11 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
selfLife = rs.getInt("SHELF_LIFE");
lotNo = rs.getString("LOT_NO");
rateClg = rs.getDouble("RATE__CLG");
//Added by sarita on 29MARCH2018 [start]
porcptaxclassDet = rs.getString("TAX_CLASS");
porcptaxchapDet = rs.getString("TAX_CHAP");
porcptaxenvDet = rs.getString("TAX_ENV");
//Added by sarita on 29MARCH2018 [end]
if ( expDateDb != null )
{
expDate = sdf.format(expDateDb);
......@@ -1926,6 +1946,11 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
xmlString.append("<gross_weight><![CDATA[").append(grossWeight * noArt).append("]]></gross_weight>");
xmlString.append("<tare_weight><![CDATA[").append(tareWeight * noArt).append("]]></tare_weight>");
xmlString.append("<net_weight><![CDATA[").append(netWeight * noArt).append("]]></net_weight>");
//Added by sarita on 29MARCH2018 [start]
xmlString.append("<tax_class>").append("<![CDATA[" + porcptaxclassDet + "]]>").append("</tax_class>");
xmlString.append("<tax_chap>").append("<![CDATA[" + porcptaxchapDet + "]]>").append("</tax_chap>");
xmlString.append("<tax_env>").append("<![CDATA[" + porcptaxenvDet + "]]>").append("</tax_env>");
//Added by sarita on 29MARCH2018 [end]
xmlString.append("</Detail2>");
}
pstmtItemLotPack.close();
......
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