Commit 195cecc1 authored by ngadkari's avatar ngadkari

added two columns gp_No and gp_Date in PostOrderActivity class

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@173692 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2cad618d
...@@ -196,8 +196,8 @@ public class PostOrderActivity { ...@@ -196,8 +196,8 @@ public class PostOrderActivity {
ResultSet rs=null,rs1=null; ResultSet rs=null,rs1=null;
String sql=""; String sql="";
String defReasCode=""; String defReasCode="";
String siteCode="",sordNo="",currCode="",lrNo="",lorryNo="",tranCode="",transMode="",remarks2="",remarks3="",remarks="",stanCodeInit="",custCode=""; String siteCode="",sordNo="",currCode="",lrNo="",lorryNo="",tranCode="",transMode="",remarks2="",remarks3="",remarks="",stanCodeInit="",custCode="",gpNo="";
Timestamp despDate=null,today=null; Timestamp despDate=null,today=null,gpDate=null;
Timestamp lrDate=null; Timestamp lrDate=null;
double exchRate=0; double exchRate=0;
String siteCodeCh="",suppCodeCh=""; String siteCodeCh="",suppCodeCh="";
...@@ -270,9 +270,11 @@ public class PostOrderActivity { ...@@ -270,9 +270,11 @@ public class PostOrderActivity {
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
today = new java.sql.Timestamp(System.currentTimeMillis()); today = new java.sql.Timestamp(System.currentTimeMillis());
//16.11.17 Nandkumar gp_no and gp_date added
sql="select d.desp_date,d.site_code,d.sord_no,d.curr_code,d.exch_rate," sql="select d.desp_date,d.site_code,d.sord_no,d.curr_code,d.exch_rate,"
+ "d.lr_no,d.lr_date,d.lorry_no,d.tran_code,d.trans_mode,s.remarks2," + "d.lr_no,d.lr_date,d.lorry_no,d.tran_code,d.trans_mode,"
+ "s.remarks3,d.stan_code__init,d.remarks " + "d.gp_no,d.gp_date,"
+ "s.remarks2,s.remarks3,d.stan_code__init,d.remarks "
+ " from despatch d, sorder s where d.sord_no=s.sale_order and d.desp_id=?"; + " from despatch d, sorder s where d.sord_no=s.sale_order and d.desp_id=?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,despId); pstmt.setString(1,despId);
...@@ -291,6 +293,8 @@ public class PostOrderActivity { ...@@ -291,6 +293,8 @@ public class PostOrderActivity {
transMode=checkNull(rs.getString("trans_mode")); transMode=checkNull(rs.getString("trans_mode"));
remarks2=rs.getString("remarks2"); remarks2=rs.getString("remarks2");
remarks3=rs.getString("remarks3"); remarks3=rs.getString("remarks3");
gpNo=rs.getString("gp_no");
gpDate=rs.getTimestamp("gp_date");
stanCodeInit=rs.getString("stan_code__init"); stanCodeInit=rs.getString("stan_code__init");
remarks=rs.getString("remarks"); remarks=rs.getString("remarks");
// 28/Nov-16 manoharan cust_pord included and separate select commented // 28/Nov-16 manoharan cust_pord included and separate select commented
...@@ -638,6 +642,8 @@ public class PostOrderActivity { ...@@ -638,6 +642,8 @@ public class PostOrderActivity {
xmlBuff.append("<chg_date><![CDATA[" + sdf.format(sysDate) + "]]></chg_date>"); xmlBuff.append("<chg_date><![CDATA[" + sdf.format(sysDate) + "]]></chg_date>");
xmlBuff.append("<chg_user><![CDATA[" + chgUser + "]]></chg_user>"); xmlBuff.append("<chg_user><![CDATA[" + chgUser + "]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA[" + chgTerm + "]]></chg_term>"); xmlBuff.append("<chg_term><![CDATA[" + chgTerm + "]]></chg_term>");
xmlBuff.append("<gp_no><![CDATA["+ checkNull(gpNo).trim() +"]]></gp_no>");
xmlBuff.append("<gp_date><![CDATA["+(gpDate) +"]]></gp_date>");
xmlBuff.append("<freight_status><![CDATA[T]]></freight_status>"); xmlBuff.append("<freight_status><![CDATA[T]]></freight_status>");
xmlBuff.append("</Detail1>"); xmlBuff.append("</Detail1>");
......
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