Skip to content

B
business-java
Commit b9f660ac authored by mmhatre's avatar mmhatre
Browse files
Options

Failes business logic - 

1. Home screen feed should show proper details
2.. Edit screen to be re arranged , 
2. Home screen from/to date filter to be added instead of sales order
3. Upload and copy button to be removed
As per mail from Pavitra 1. site code 2. cust code 3. itemser to be added in this table
Also add ref_date

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203265 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e7dd56fb
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 6 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrderProcess.java
View file @ b9f660ac
......@@ -148,7 +148,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
String currDate="";
String fromCustCode="",toCustCode="",fromSaleOrder="",toSaleOrder="",lotSl="",toDateStr="",fromDateStr="";
String refreshDb="",allocStk="",clubPendingOrd="",adjDrcr="",adjCustAdv="",clubOrder="",siteCodeShip="";
String advAdjMode="",postUptoInvoice="",adjNewProdInv="",loginSiteCode="",errString="",retString="",orderType="";
String advAdjMode="",postUptoInvoice="",adjNewProdInv="",loginSiteCode="",errString="",retString="",orderType="",refDate ="";
String sql="",custCode="";
// String[] custCode;
int cnt = 0,liCtr = 0,custCdIndex = 0,sordIndex=0,count = 0;
......@@ -171,6 +171,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
currDate = (sdf.format(timestamp).toString()).trim();
loginSiteCode =(e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
/* refDate = checkNull(this.genericUtility.getColumnValue("ref_date", headerDom));*/
orderType=e12GenericUtility.getColumnValue("order_type",headerDom);
//System.out.println("orderType :"+orderType);
fromSaleOrder=checkNullAndTrim(e12GenericUtility.getColumnValue("tran_id__fr",headerDom));
......@@ -1584,7 +1587,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
public int writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws SQLException, ITMException
public int writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws ITMException, Exception
{
PreparedStatement pstmt = null;
......@@ -1596,6 +1599,18 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
String lsStatus = null;
//Pavan R End
String lsCrPolicy= "",asDespId="",asSorder="", lsStr="";
String custCodeBil="",custCodeSold="",refDate="",itemSer="";
//added by manish mhatre on 28-6-2019
Timestamp refDateTs=null,tranDate = null;
String rfDate = null;
/*Calendar currentDate = Calendar.getInstance();
SimpleDateFormat sdf;
SimpleDateFormat simpleDateFormat = null;
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String tranDateStr = sdf.format(tranDate.getTime());*/
//end manish mhatre
int insrtCnt = 0;
System.out.println("@@@@@@@@@@ errStringList["+errStringList.size()+"]");
......@@ -1615,26 +1630,31 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if( strArray.length > 0 )
{
lsCrPolicy=strArray[0];
System.out.println("cr policy:"+lsCrPolicy);
}
if( strArray.length > 1 )
{
asDespId=strArray[1];
System.out.println("desp id:"+asDespId);
}
if( strArray.length > 2 )
{
asSorder=strArray[2];
System.out.println("sorder:"+asSorder);
}
if( strArray.length > 3 )
{
//lsStr=strArray[3];//Pavan R on 14sept18 [to handle NumberFormatException from lsStr in failedPolicyList]
chkamt =(Double.parseDouble(strArray[3]));
System.out.println("chk amt:"+chkamt);
}
//Added by Pavan R on 27/OCT/17
if( strArray.length > 4 )
{
//chkamt =(Double.parseDouble(strArray[4]));//Pavan R on 14sept18 [to handle NumberFormatException from lsStr in failedPolicyList]
lsStr=strArray[4];
System.out.println("lsstr:"+lsStr);
}
if( strArray.length > 5 )
{
......@@ -1647,6 +1667,60 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
}
//added by manish mhatre on 28-6-2019
if(strArray.length > 6)
{
custCodeBil=strArray[6];
System.out.println("bill:"+custCodeBil);
}
if(strArray.length>7)
{
custCodeSold=strArray[7];
System.out.println("sold:"+custCodeSold);
}
if(strArray.length>8)
{
/*siteCode=strArray[8];
System.out.println("site code:"+siteCode);*/
siteCode = checkNull(strArray[8]);
}
if(strArray.length>9)
{
itemSer=checkNull(strArray[9]);
System.out.println("item ser:"+itemSer);
}
if(strArray.length>10)
{
/*refDate=strArray[10];
System.out.println("refdate"+refDate);
if(refDate!=null && refDate.trim().length()>0)
{
refDateTs = Timestamp.valueOf(genericUtility.getValidDateString( refDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
tranDate=Timestamp.valueOf(genericUtility.getValidDateString(rfDate,genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("refdate timestamp:"+refDateTs);
}*/
refDate=strArray[10];
System.out.println("refdate"+refDate);
if(refDate!=null && refDate.trim().length()>0)
{
tranDate = Timestamp.valueOf(genericUtility.getValidDateString( refDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
/*tranDate=Timestamp.valueOf(genericUtility.getValidDateString(rfDate,genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");*/
System.out.println("refdate timestamp:"+tranDate);
}
}
System.out.println("refdate timestamp1:"+tranDate);
//end manish mhatre
System.out.println("chkamt::["+chkamt+"]::lsStatus::["+lsStatus+"]");
// Pavan R End
}
......@@ -1709,8 +1783,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
// " , APRV_DATE, EMP_CODE__APRV" +
", APRV_AMT, USED_AMT " +
// " , LINE_NO, OS_AMT__CUST, OS_AMT__CONT, REMARKS, AMD_NO " +
", CUST_CODE__BIL , CUST_CODE , SITE_CODE , ITEM_SER , REF_DATE " + //added by manish mhatre on 28-6-2019
" )" +
" values (?,?,?,?,?,?,?,?" +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?" +
// " ,?,?,?," +
// " ?,?,?,?,?" +
" ) ";
......@@ -1732,6 +1807,23 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//USED_AMT NUMBER(14,3)
pstmt.setDouble(8,0);
//added by manish mhatre on 28-6-2019
//CUST_CODE__BIL
pstmt.setString(9,custCodeBil);
//CUST_CODE
pstmt.setString(10, custCodeSold);
// SITE_CODE
pstmt.setString(11, siteCode);
// ITEM_SER
pstmt.setString(12, itemSer);
//REF_DATE
pstmt.setTimestamp(13, tranDate);
/*pstmt.setTimestamp(13,refDateTs );*/
System.out.println("trandate"+tranDate);
//end manish mhatre
/* //APRV_DATE DATE
pstmt.setString(7,tranId);
......
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