Commit e164798f authored by prane's avatar prane

added taxes for despatch

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204227 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1ee39701
...@@ -236,8 +236,8 @@ public class ConsolidatToDoc { ...@@ -236,8 +236,8 @@ public class ConsolidatToDoc {
"NETT_WEIGHT, MFG_DATE, EXP_DATE, SITE_CODE__MFG, RATE__CLG, COST_RATE, LINE_TYPE, " + "NETT_WEIGHT, MFG_DATE, EXP_DATE, SITE_CODE__MFG, RATE__CLG, COST_RATE, LINE_TYPE, " +
//Changed by sumit on 18/02/13 adding rate__std column //Changed by sumit on 18/02/13 adding rate__std column
//"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PART_NO,PALLET_NO) " + //"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PART_NO,PALLET_NO) " +
"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PART_NO,PALLET_NO,RATE__STD ) " + "CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PART_NO,PALLET_NO,RATE__STD, TAX_CHAP, TAX_CLASS, TAX_ENV ) " +
"VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?) "; //chnage done by Kunal Mandhre insert pallet no as per S Manoharan Sir instruction "VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?, ?,?,?) "; //chnage done by Kunal Mandhre insert pallet no as per S Manoharan Sir instruction
} }
else if("D-ORD".equalsIgnoreCase(tranRefSer)) else if("D-ORD".equalsIgnoreCase(tranRefSer))
{ {
...@@ -1040,6 +1040,40 @@ public class ConsolidatToDoc { ...@@ -1040,6 +1040,40 @@ public class ConsolidatToDoc {
//Changed and added by Santosh on 08/03/2018 to generate wave task from dist order[Start] //Changed and added by Santosh on 08/03/2018 to generate wave task from dist order[Start]
if("S-ORD".equalsIgnoreCase(tranRefSer)) if("S-ORD".equalsIgnoreCase(tranRefSer))
{ {
//Pavan Rane----------------------
String sordItmSql = "SELECT TAX_CHAP FROM SORDITEM WHERE SALE_ORDER = ? AND LINE_NO = ? AND EXP_LEV = ? ";
PreparedStatement sordItmPstmt = conn.prepareStatement(sordItmSql);
sordItmPstmt.setString(1, saleOrder);
sordItmPstmt.setString(2, lineNoSord);
sordItmPstmt.setString(3, expLev);
ResultSet sordItmRs = sordItmPstmt.executeQuery();
if(sordItmRs.next())
{
taxChap = checkNull(sordItmRs.getString("TAX_CHAP"));
}
sordItmRs.close();
sordItmRs = null;
sordItmPstmt.close();
sordItmPstmt = null;
sordItmSql = "SELECT TAX_CLASS, TAX_ENV FROM SORDDET WHERE SALE_ORDER = ? AND LINE_NO = ? ";
sordItmPstmt = conn.prepareStatement(sordItmSql);
sordItmPstmt.setString(1, saleOrder);
sordItmPstmt.setString(2, lineNoSord);
sordItmRs = sordItmPstmt.executeQuery();
if(sordItmRs.next())
{
taxClass = checkNull(sordItmRs.getString("TAX_CLASS"));
taxEnv = checkNull(sordItmRs.getString("TAX_ENV"));
}
sordItmPstmt.close();
sordItmPstmt = null;
sordItmRs.close();
sordItmRs = null;
System.out.println("Taxes :: tranRefSer["+tranRefSer+"]taxChap["+taxChap+"]taxClass["+taxClass+"]taxEnv["+taxEnv+"]");
//end----------------------------
pstmt1.setString(1, despId); pstmt1.setString(1, despId);
//pstmt1.setInt(2, lineNo);//Gulzar on 12/28/2011 //pstmt1.setInt(2, lineNo);//Gulzar on 12/28/2011
pstmt1.setString(2, despLineNo);//Gulzar on 12/28/2011 pstmt1.setString(2, despLineNo);//Gulzar on 12/28/2011
...@@ -1118,7 +1152,12 @@ public class ConsolidatToDoc { ...@@ -1118,7 +1152,12 @@ public class ConsolidatToDoc {
pstmt1.setString( 37 , checkNull(partNo)); pstmt1.setString( 37 , checkNull(partNo));
pstmt1.setString( 38 , checkNull(palletNo)); //added by Kunal Mandhre on 02/08/12 as per S Manoharan Sir intruction . pstmt1.setString( 38 , checkNull(palletNo)); //added by Kunal Mandhre on 02/08/12 as per S Manoharan Sir intruction .
pstmt1.setDouble( 39 , rateStd);//added by sumit on 18/02/13 pstmt1.setDouble( 39 , rateStd);//added by sumit on 18/02/13
//added by Pavan Rane on 30jul19 start
pstmt1.setString( 40 , taxChap);
pstmt1.setString( 41 , taxClass);
pstmt1.setString( 42 , taxEnv);
//Pavan Rane on 30jul19 end
} }
else if("D-ORD".equalsIgnoreCase(tranRefSer)) else if("D-ORD".equalsIgnoreCase(tranRefSer))
{ {
......
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