Skip to content

B
business-java
Commit 216ccfac authored by cpatil's avatar cpatil
Browse files
Options

modify for post order process 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101077 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c9839ae9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5646 additions and 4421 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java
View file @ 216ccfac
......@@ -8,7 +8,6 @@
package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ActionHandlerEJB;
......@@ -182,9 +181,11 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
Timestamp despDate = null,gpDate = null;
int cnt = 0,editOption = 0,detCount = 0;
boolean isLocal=false;
String autoInvOnDesp="";
try
{
itmDBAccessEJB = new ITMDBAccessEJB();
autoInvOnDesp = distCommon.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn);
/* if(conn==null)
{
......@@ -331,7 +332,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
//despatch_edit.setitem(ll_ctr,"confirmed", 'Y') //Ruchira 21/09/2k5 taken out of abovve if ... endif statement.
// CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
// CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
varValuePurInteg = checkNull(distCommon.getDisparams("999999","PUR_INTEGRATED",conn));
......@@ -360,7 +361,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
{
//channelPartner and dis link retrieved earlier
if(channelPartner == null)
if(channelPartner == null || channelPartner.trim().length() == 0 )
{
sql1 = "select channel_partner, dis_link from customer "
+" where cust_code = ? ";
......@@ -380,7 +381,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt1 = null;
}
//Took code from Porder amd conf
//Took code from Porder amd conf
if(channelPartner == "Y" || editOption > 0)
{
if(disLink == "E" || editOption > 0 )
......@@ -1299,32 +1300,18 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.close();
pstmt = null;
}
}
}
}//status not cancelled
}
pstmt3.close();
pstmt3 = null;
rs3.close();
rs3 = null;
}
System.out.println("ERROR STRING WHILE DESPATCH CONFIRMATION!!!!!!!!!!!!!!"+errString);
System.out.println("ERROR STRING WHILE DESPATCH CONFIRMATION!!!!!!!!!!!!!!"+errString);
if(errString == null || errString.trim().length()== 0)
{
......@@ -1342,9 +1329,65 @@ System.out.println("ERROR STRING WHILE DESPATCH CONFIRMATION!!!!!!!!!!!!!!"+errS
if(confirmCnt > 0)
{
InvAcct inv = new InvAcct();
errString = inv.despatchPost(tranId,"S-DSP",conn);
if(errString.trim().length() == 0 || errString == null)
{
if("Y".equalsIgnoreCase(autoInvOnDesp))
{
String fromSaleOrder="", fromCustCode="", orderType="", siteCodeShip="";
Timestamp fromDate = null;
sql = " select d.sord_no,d.cust_code,so.order_type, d.desp_date, so.site_code__ship " +
" from despatch d, sorder so " +
" where d.desp_id = ? and d.sord_no = so.sale_order ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId );
rs = pstmt.executeQuery();
if(rs.next())
{
fromSaleOrder = checkNull(rs.getString("sord_no"));
fromCustCode = checkNull(rs.getString("cust_code"));
orderType = checkNull(rs.getString("order_type"));
fromDate = rs.getTimestamp("desp_date");
siteCodeShip = checkNull(rs.getString("site_code__ship"));
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
System.out.println("@@@@@@@@@ fromSaleOrder["+fromSaleOrder+"]fromCustCode["+fromCustCode+"]orderType["+orderType+"]fromDate["+fromDate+"]siteCodeShip["+siteCodeShip+"]");
// setting default value like post order default
String clubOrder = "",clubPendingOrd="",adjDrcr="",adjCustAdv="",advAdjMode="",adjNewProdInv="";
//Boolean adjDrcrFlag= false, adjAdv=false, adjNewProdInvFlag=false;
clubOrder = "N";
clubPendingOrd="N";
adjDrcr="N";
adjCustAdv="N";
advAdjMode="C";
adjNewProdInv="N";
PostOrderProcess postOrderProcess = new PostOrderProcess();
// fromSaleOrder, toSaleOrder, fromCustCode, toCustCode, tranIdDespatch, orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn
errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId , orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn);
System.out.println("@@@@@@@@@689 invPosting() errString::::::["+errString+"]");
}
}
if( errString == null || errString.trim().length() == 0)
{
System.out.println("errCode in despatch posting===="+errString);
System.out.println(">>The selected transaction is confirmed!!!!");
errString= "<?xml version='1.0'?><Root><message>VTPOSTDES</message><TranID>"+tranId+"</TranID></errors></Root>";
System.out.println("@@@@@ retString:" + errString);
System.out.println("@@@@@ retString:[" + errString+"]");
}
}
/*sql = "select confirmed from despatch where desp_id = ?";
......@@ -1364,8 +1407,8 @@ System.out.println("ERROR STRING WHILE DESPATCH CONFIRMATION!!!!!!!!!!!!!!"+errS
}
}
catch(Exception e)
{
catch(Exception e)
{
try
{
conn.rollback();
......@@ -1376,9 +1419,9 @@ catch(Exception e)
e.printStackTrace();
System.out.println("Exception ::"+e.getMessage());
throw new ITMException(e);
}
finally
{
}
finally
{
try
{
......
webitm-dis/ibase/webitm/ejb/dis/InvoiceDrcrAdj.java 0 → 100755
View file @ 216ccfac
This diff is collapsed.
webitm-dis/ibase/webitm/ejb/dis/PostOrdDespatchGen.java
View file @ 216ccfac
......@@ -655,6 +655,9 @@ public class PostOrdDespatchGen
pstmt1.close();
pstmt1 = null;
status="I";
System.out.println("@@@@@@@ quantity allocQty["+allocQty+"]");
tempMapSord=new HashMap();// contain values for sorditem
tempMapSord.put("line_no__sord", lineNoOrd);
......@@ -1514,6 +1517,11 @@ public class PostOrdDespatchGen
sordDetMap=(HashMap) sordDetList.get(sordCtr);
System.out.println("@@@@@@@@@@@sordDetMap values======[[["+sordDetMap+"]]]");
if( (Double)sordDetMap.get("quantity") == 0)
{
System.out.println("@@@@@@@@@@@@@@@@@@@ test continue.........");
continue;
} //test purpose
/*lc_qty_std = desp_det.getitemnumber(ls_ctr, "quantity__stduom")
lc_rate_std = desp_det.getitemnumber(ls_ctr, "rate__stduom")
lc_tot_amt = lc_tot_amt + (lc_rate_std * lc_qty_std)*/
......
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