Commit 083af167 authored by mjadhav's avatar mjadhav

added orderDate,priceList,trasporter,transpotermode,deliverTo,deliverTerm


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95026 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c83681bb
......@@ -86,12 +86,25 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
} //end of confirm method
public String process(Document dom, Document dom2, String windowName,String xtraParams) throws RemoteException, ITMException
{
System.out.println("process called..18-04-2014......");
System.out.println("process called..28-04-2014......");
String sql = "";
String errString = "";
String siteCode = "";
String tranId = "",custCode="",conf="";
//String orderDate=null;
Date orderDate=null;
String priceList="" ,deliverTo="" ,deliverTerm = "" ,transporter="" ,transporterMode="",prdCode="";
int tranIdFound=0,cusCodeFound=0,prcpFound = 0;
int deliverToFound=0;
int deliveryTermFound=0;
int transporterFound=0;
int transporterModeFound=0;
int pricelistFound=0;
int periodCnt=0;
Connection conn = null;
ConnDriver connDriver = null;
PreparedStatement pstmt = null;
......@@ -108,6 +121,40 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
connDriver = null;
tranId = checkNull(genericUtility.getColumnValue("tran_id", dom));
custCode = checkNull(genericUtility.getColumnValue("cust_code", dom));
//added by mahendra dated 28/Apr/2014
//orderDate=genericUtility.getColumnValue("price_list", dom);
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
/*if (genericUtility.getColumnValue("order_date", dom) == null)
{
orderDate = null;
}
else
{
orderDate=sdf.format(genericUtility.getColumnValue("order_date", dom)).toString();
}*/
System.out.println("orderDate : "+orderDate);
if(genericUtility.getColumnValue("order_date", dom) != null)
{
orderDate=sdf.parse(genericUtility.getColumnValue("order_date", dom));
}
priceList=checkNull(genericUtility.getColumnValue("price_list", dom));
deliverTo=checkNull(genericUtility.getColumnValue("cust_code__dlv", dom));
deliverTerm=checkNull(genericUtility.getColumnValue("dlv_term", dom));
transporter=checkNull(genericUtility.getColumnValue("tran_code", dom));
transporterMode=checkNull(genericUtility.getColumnValue("trans_mode", dom));
System.out.println("orderDate !!!!!! :"+orderDate);
System.out.println("priceList :"+priceList);
System.out.println("deliverTo :"+deliverTo);
System.out.println("deliverTerm :"+deliverTerm);
System.out.println("transporter :"+transporter);
System.out.println("transporterMode :"+transporterMode);
conn.setAutoCommit(false);
if(tranId.trim() !=null && tranId.trim().length() >0)
{
......@@ -224,9 +271,177 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
errString = itmDBAccessEJB.getErrorString("","VTCSCDNTNL ","","",conn);
return errString;
}
//added by mahendra dated 30/APR/14
System.out.println("deliverTerm length :"+deliverTerm.trim().length());
System.out.println("orderDate : "+orderDate);
if(orderDate != null)
{
sql = "select code from period where ? between fr_date and to_date";
pstmt = conn.prepareStatement(sql);
pstmt.setDate(1, new java.sql.Date(orderDate.getTime()));
rs = pstmt.executeQuery();
if (rs.next())
{
prdCode = rs.getString(1);
}
System.out.println("prdCode :"+prdCode);
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select count(*) from period_stat where site_code = ? and prd_code = ? and stat_sal='Y' ";
System.out.println("sql1 :"+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
pstmt.setString(2, prdCode);
rs = pstmt.executeQuery();
if (rs.next())
{
periodCnt = rs.getInt(1);
}
System.out.println("periodCnt :"+periodCnt);
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("periodCnt :"+periodCnt);
if (periodCnt == 0)
{
System.out.println("Invalid order date !!!");
errString = itmDBAccessEJB.getErrorString("","VTORDTINV ","","",conn);
return errString;
}
}
if(priceList.trim() !=null && priceList.trim().length() >0)
{
sql = "select count(*) from gencodes where fld_value=? and FLD_NAME='PRICE_LIST' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,priceList);
rs = pstmt.executeQuery();
if(rs.next())
{
pricelistFound = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(pricelistFound == 0)
{
System.out.println("Invalid price list !!!!");
errString = itmDBAccessEJB.getErrorString("","VTPRLSTINV ","","",conn);
return errString;
}
}
if(deliverTo.trim() !=null && deliverTo.trim().length() >0)
{
sql = "select count(*) from site_customer where cust_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,deliverTo);
rs = pstmt.executeQuery();
if(rs.next())
{
deliverToFound = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(deliverToFound == 0)
{
System.out.println("Invalid delivery To");
errString = itmDBAccessEJB.getErrorString("","VTDLVTOINV ","","",conn);
return errString;
}
}
if(deliverTerm.trim() !=null && deliverTerm.trim().length() >0)
{
sql = "select count(*) from delivery_term where dlv_term=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,deliverTerm);
rs = pstmt.executeQuery();
if(rs.next())
{
deliveryTermFound = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(deliveryTermFound == 0)
{
System.out.println("Invalid delivery term !!!");
errString = itmDBAccessEJB.getErrorString("","VTDLVTMINV ","","",conn);
return errString;
}
}
if(transporter.trim() !=null && transporter.trim().length() >0)
{
sql = "select count(*) from transporter where tran_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,transporter);
rs = pstmt.executeQuery();
if(rs.next())
{
transporterFound = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(transporterFound == 0)
{
System.out.println("Invalid transporter !!!");
errString = itmDBAccessEJB.getErrorString("","VTTRANCD1 ","","",conn);
return errString;
}
}
if(transporterMode.trim() !=null && transporterMode.trim().length() >0)
{
sql = "select count(*) from gencodes where fld_value=? and FLD_NAME = 'TRANS_MODE' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,transporterMode);
rs = pstmt.executeQuery();
if(rs.next())
{
transporterModeFound = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(transporterModeFound == 0)
{
System.out.println("Invalid transporter mode !!!");
errString = itmDBAccessEJB.getErrorString("","VTTRSMDINV ","","",conn);
return errString;
}
}
if(tranIdFound > 0 && cusCodeFound > 0)
{
errString = generateSaleOrder(tranId,custCode, xtraParams,conn);
errString = generateSaleOrder(tranId,custCode,orderDate,priceList,deliverTo,deliverTerm,transporter,transporterMode,xtraParams,conn);
errString = errString.toLowerCase(); // change on 18/apr/14 ..ritesh
System.out.println("err String from generateSaleOrder ="+errString);
if((errString != null ) && (errString.indexOf("success") > -1 || errString.indexOf("vtsucc1") >-1 || errString.indexOf("confirmed") >-1) )//Added by manoj dtd 23/08/2013 to check whether generated transaction is confirmed successfully
......@@ -300,7 +515,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
}
return errString;
}
private String generateSaleOrder(String tranId,String custCode, String xtraParams, Connection conn) throws RemoteException, ITMException
private String generateSaleOrder(String tranId,String custCode,Date orderDate_input,String priceList_input,String deliverTo_input,String deliverTerm_input,String transporter_input,String transporterMode_input,String xtraParams, Connection conn) throws RemoteException, ITMException
{
String userId = "";
String termId = "";
......@@ -328,7 +544,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
String taxClass="";
String taxChap="";
String groupCode="";
String currCode1 ="",currCode2="";
String currCode1 ="",currCode2="",custCodeDlv="";
String taxEnv = "",purcOrder = "",tranCode="",pricelistTmp="",pricelistClgTmp="";
String packCode ="",convRtuomStduom="",rateStduom="",dlvTo="";
String lineno = "",noArt = "",netAmt = "",frtTerm="",deliveryTerm="",commpercon="",commPercOn2="";
......@@ -336,6 +552,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
String transmodeFromCust="",custCodeBil="",pricelist="",pricelistClg="",salespers="",salespers1="",salespers2="";
String add1="",add2="",add3="",tele1="",tele2="",tele3="";
Date orderDt = null;
Date orderDateInput=null;
Date lrDate=null;
PreparedStatement pstmt = null;
ResultSet rs = null;
double exchRate =0,rateClg = 0,discount = 0,minShelf=0,maxShelf=0;
......@@ -381,7 +599,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rs = null;
sql = "select tran_type,tran_date,item_ser,site_code,curr_code,exch_rate,tran_code," +
"trans_mode,curr_code__frt,curr_code__ins,purc_order from porcp where tran_id = ? " ;
"trans_mode,curr_code__frt,curr_code__ins,purc_order,lr_date from porcp where tran_id = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -398,8 +616,10 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
currCodeIns = rs.getString("curr_code__ins") == null ? " " : rs.getString("curr_code__ins");
purcOrder = rs.getString("purc_order") == null ? " " : rs.getString("purc_order");
tranCode = rs.getString("tran_code") == null ? " " : rs.getString("tran_code");
System.out.println("Added by mahendra 05-05-2014");
lrDate= rs.getDate("lr_date");
}
System.out.println("lrDate !!! "+lrDate);
rs.close();
rs =null;
......@@ -443,6 +663,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
frtTerm = rs.getString("frt_term")== null ?" ":rs.getString("frt_term");
dlvTo = rs.getString("cust_name")== null ?" ":rs.getString("cust_name");
groupCode = rs.getString("group_code")== null ?" ":rs.getString("group_code");
if(transMode == null || transMode.trim().length()==0)
{
transMode = rs.getString("trans_mode")== null ?" ":rs.getString("trans_mode");
......@@ -480,6 +701,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rs =null;
pstmt.close();
pstmt = null;
System.out.println("itemSer :::::"+itemSer);
if (salesPersTmp != null && salesPersTmp.trim().length() > 0 )
{
salespers = salesPersTmp;
......@@ -499,7 +721,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
{
crTerm = crTermTmp;
}
System.out.println("itemSer @@@@"+itemSer);
sql = "select price_list,price_list__clg from site_customer where site_code = ? and cust_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
......@@ -541,7 +763,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rs =null;
pstmt.close();
pstmt = null;
System.out.println("itemSer !!!!!"+itemSer);
sql = "select dlv_term, TRAN_CODE, CURR_CODE__FRT ,CURR_CODE__INS,addr1,addr2,addr3,tele1,tele2,tele3 from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCode);
......@@ -577,7 +799,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rs =null;
pstmt.close();
pstmt = null;
System.out.println("itemSer ######"+itemSer);
if(!isCustsalePers)
{
sql = " select comm_perc , comm_perc__on from customer_series where cust_code = ? and item_ser = ? ";
......@@ -731,7 +953,40 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rs = null;
}
System.out.printf("data --------"+orderType,orderDt,siteCode,projCode,currencyCode,exchRate,remarks);
//added by mahendra dated 28/APR/2014
System.out.println("mahendra testing : checked value!@@@@!!!!!");
System.out.println("pricelist :"+pricelist);
System.out.println("priceList_input :"+priceList_input);
System.out.println("orderDate_input :"+orderDate_input);
System.out.println("orderDt :"+orderDt);
System.out.println("orderDate_input :"+orderDate_input);
orderDt=orderDate_input==null?orderDt:orderDate_input;
System.out.println("orderDt final value :"+orderDt);
pricelist=priceList_input==""?pricelist:priceList_input;
custCodeDlv=deliverTo_input==""?custCode:deliverTo_input;
deliveryTerm=deliverTerm_input==""?deliveryTerm:deliverTerm_input;
transMode=transporterMode_input==""?transMode:transporterMode_input;
tranCode=transporter_input==""?tranCode:transporter_input;
System.out.println("orderDt :"+orderDt);
System.out.println("pricelist :"+pricelist);
System.out.println("dlvTo :"+dlvTo);
System.out.println("deliveryTerm :"+deliveryTerm);
System.out.println("transMode :"+transMode);
System.out.println("tranCode :"+tranCode);
System.out.println("pricelist :"+pricelist);
xmlBuff = new StringBuffer();
System.out.println("--XML CREATION --");
......@@ -765,7 +1020,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("<site_code__ship><![CDATA["+ siteCode.trim() +"]]></site_code__ship>");
xmlBuff.append("<cust_code><![CDATA["+ groupCode.trim() +"]]></cust_code>");
xmlBuff.append("<cust_code__bil><![CDATA["+ custCodeBil.trim() +"]]></cust_code__bil>");
xmlBuff.append("<cust_code__dlv><![CDATA["+ custCode.trim() +"]]></cust_code__dlv>");
xmlBuff.append("<cust_code__dlv><![CDATA["+ custCodeDlv.trim() +"]]></cust_code__dlv>");
xmlBuff.append("<stan_code><![CDATA["+ stanCode.trim() +"]]></stan_code>");
xmlBuff.append("<STAN_CODE__INIT><![CDATA["+ stanCode.trim() +"]]></STAN_CODE__INIT>");
xmlBuff.append("<cr_term><![CDATA["+ crTerm +"]]></cr_term>");
......@@ -1141,7 +1396,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
System.out.println( "confirm sale order generate and confirm successfully ...");
if(tranIdForIssue != null)
{
retString = despatchOrder(tranIdForIssue,custCode,tranId, xtraParams,conn);
retString = despatchOrder(tranIdForIssue,custCode,tranId,lrDate,xtraParams,conn);
System.out.println("ret String from despatchOrder ="+retString);
return retString;
}
......@@ -1183,7 +1438,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
System.out.println("Returning Result [" + retString + "]");
return retString;
}
private String despatchOrder(String saleOrder,String custCode,String tranId, String xtraParams, Connection conn) throws RemoteException, ITMException
private String despatchOrder(String saleOrder,String custCode,String tranId,Date lrDate, String xtraParams, Connection conn) throws RemoteException, ITMException
{
String userId = "", termId = "";
String sql = "";
......@@ -1215,6 +1470,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
String locCode = "",rateStduom="",netAmt="";
String varValue = "",unitStd = "",noArt = "";
String stanCodeDlv="",dlvCity="",dlvPin="",countCodeDlv="",tranCode="",stanCodeInit="",status="",statusRemarks="";
String lrDateVal="";
Date orderDt = null,statusDate=null;
PreparedStatement pstmt = null,pstmt1 =null;
ResultSet rs = null,rs1 = null;
......@@ -1263,7 +1519,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
status = rs.getString("STATUS") == null ? " " : rs.getString("STATUS");
statusRemarks = rs.getString("STATUS_REMARKS") == null ? " " : rs.getString("STATUS_REMARKS");
statusDate = rs.getDate("STATUS_DATE");
}
rs.close();
rs =null;
......@@ -1281,6 +1538,10 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rs =null;
pstmt.close();
pstmt = null;
//lrDate added by mahendra on 05-05-2014
System.out.println("lrDate date is :"+lrDate);
lrDateVal=lrDate==null?"":sdf.format(lrDate);
System.out.println("lrDateVal date is :"+lrDateVal);
xmlBuff = new StringBuffer();
System.out.println("--XML CREATION --");
......@@ -1313,6 +1574,9 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("<cust_code__dlv><![CDATA["+ custCode.trim() +"]]></cust_code__dlv>");
xmlBuff.append("<stan_code><![CDATA["+ stanCode.trim() +"]]></stan_code>");
xmlBuff.append("<trans_mode><![CDATA["+ transMode.trim() +"]]></trans_mode>");
//lrDate added by mahendra dated 05-05-2014
xmlBuff.append("<lr_date><![CDATA["+ lrDateVal.toString() +"]]></lr_date>");
xmlBuff.append("<curr_code__frt><![CDATA["+ currCodeFrt.trim() +"]]></curr_code__frt>");
xmlBuff.append("<curr_code__ins><![CDATA["+ currCodeIns.trim() +"]]></curr_code__ins>");
xmlBuff.append("<curr_code><![CDATA["+ currencyCode.trim() +"]]></curr_code>");
......
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