Commit 0a093153 authored by mjadhav's avatar mjadhav

add orderdate,transporter,transportermode,pricelist,deliveryto,deliveryMode field


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95027 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 083af167
...@@ -350,7 +350,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde ...@@ -350,7 +350,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
if(deliverTo.trim() !=null && deliverTo.trim().length() >0) if(deliverTo.trim() !=null && deliverTo.trim().length() >0)
{ {
sql = "select count(*) from site_customer where cust_code=?"; sql = "select count(*) from customer where cust_code=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,deliverTo); pstmt.setString(1,deliverTo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -516,7 +516,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde ...@@ -516,7 +516,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
return errString; return errString;
} }
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 private String generateSaleOrder(String tranId,String custCode,Date orderDateDom,String priceListDom,String deliverToDom,String deliverTermDom,String transporterDom,String transporterModeDom,String xtraParams, Connection conn) throws RemoteException, ITMException
{ {
String userId = ""; String userId = "";
String termId = ""; String termId = "";
...@@ -958,20 +958,20 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde ...@@ -958,20 +958,20 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
//added by mahendra dated 28/APR/2014 //added by mahendra dated 28/APR/2014
System.out.println("mahendra testing : checked value!@@@@!!!!!"); System.out.println("mahendra testing : checked value!@@@@!!!!!");
System.out.println("pricelist :"+pricelist); System.out.println("pricelist :"+pricelist);
System.out.println("priceList_input :"+priceList_input); System.out.println("priceList_input :"+priceListDom);
System.out.println("orderDate_input :"+orderDate_input); System.out.println("orderDate_input :"+orderDateDom);
System.out.println("orderDt :"+orderDt); System.out.println("orderDt :"+orderDt);
System.out.println("orderDate_input :"+orderDate_input); System.out.println("orderDate_input :"+orderDateDom);
orderDt=orderDate_input==null?orderDt:orderDate_input; orderDt=orderDateDom==null?orderDt:orderDateDom;
System.out.println("orderDt final value :"+orderDt); System.out.println("orderDt final value :"+orderDt);
pricelist=priceList_input==""?pricelist:priceList_input; pricelist=priceListDom==""?pricelist:priceListDom;
custCodeDlv=deliverTo_input==""?custCode:deliverTo_input; custCodeDlv=deliverToDom==""?custCode:deliverToDom;
deliveryTerm=deliverTerm_input==""?deliveryTerm:deliverTerm_input; deliveryTerm=deliverTermDom==""?deliveryTerm:deliverTermDom;
transMode=transporterMode_input==""?transMode:transporterMode_input; transMode=transporterModeDom==""?transMode:transporterModeDom;
tranCode=transporter_input==""?tranCode:transporter_input; tranCode=transporterDom==""?tranCode:transporterDom;
System.out.println("orderDt :"+orderDt); System.out.println("orderDt :"+orderDt);
System.out.println("pricelist :"+pricelist); System.out.println("pricelist :"+pricelist);
......
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